mirror of
https://github.com/git/git.git
synced 2024-10-29 21:37:53 +01:00
aa1a0111cc
Cherry-picking can be helped by reusing previous confliction resolution by invoking rerere automatically. Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
45 lines
982 B
Bash
Executable file
45 lines
982 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='cherry-pick should rerere for conflicts'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
echo foo >foo &&
|
|
git add foo && test_tick && git commit -q -m 1 &&
|
|
echo foo-master >foo &&
|
|
git add foo && test_tick && git commit -q -m 2 &&
|
|
|
|
git checkout -b dev HEAD^ &&
|
|
echo foo-dev >foo &&
|
|
git add foo && test_tick && git commit -q -m 3 &&
|
|
git config rerere.enabled true
|
|
'
|
|
|
|
test_expect_success 'conflicting merge' '
|
|
test_must_fail git merge master
|
|
'
|
|
|
|
test_expect_success 'fixup' '
|
|
echo foo-dev >foo &&
|
|
git add foo && test_tick && git commit -q -m 4 &&
|
|
git reset --hard HEAD^
|
|
echo foo-dev >expect
|
|
'
|
|
|
|
test_expect_success 'cherry-pick conflict' '
|
|
test_must_fail git cherry-pick master &&
|
|
test_cmp expect foo
|
|
'
|
|
|
|
test_expect_success 'reconfigure' '
|
|
git config rerere.enabled false
|
|
git reset --hard
|
|
'
|
|
|
|
test_expect_success 'cherry-pick conflict without rerere' '
|
|
test_must_fail git cherry-pick master &&
|
|
test_must_fail test_cmp expect foo
|
|
'
|
|
|
|
test_done
|