development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

t7605: add a testcase demonstrating a bug with trivial merges

Browse source 
Repeating a trivial merge more than once will leave the index out of
sync, despite being clean before the merge and operating on the
exact same heads as the first run.  The recorded merge has the
correct tree and the working tree is brought up to date, it is just
the index that is left as it was before the merge.  Every attempt to
repeat the merge beyond the first will leave the index in the same
weird out-of-sync state.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2016-04-09 23:13:39 -07:00 committed by Junio C Hamano
parent 7b0d47b3b6
commit ef7d3621d7
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
t/t7605-merge-resolve.sh
View file

@ -27,7 +27,7 @@ test_expect_success 'setup' '
git tag c3
'
test_expect_success 'merge c1 to c2' '
merge_c1_to_c2_cmds='
git reset --hard c1 &&
git merge -s resolve c2 &&
test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
@ -41,6 +41,10 @@ test_expect_success 'merge c1 to c2' '
test 3 = $(git ls-files | wc -l)
'
test_expect_success 'merge c1 to c2' "$merge_c1_to_c2_cmds"
test_expect_failure 'merge c1 to c2, again' "$merge_c1_to_c2_cmds"
test_expect_success 'merge c2 to c3 (fails)' '
git reset --hard c2 &&
test_must_fail git merge -s resolve c3