Revision 00653435488f5ed86c5d6dc411fa14fa56f5e3bc authored by Junio C Hamano on 18 January 2012, 23:46:31 UTC, committed by Junio C Hamano on 18 January 2012, 23:46:31 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 5c8eeb8
t3504-cherry-pick-rerere.sh
#!/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
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...