| commit | ef7d3621d76fe210827698cba79c737906048191 | |
| author | Elijah Newren <newren@gmail.com> | |
| Sun, 10 Apr 2016 06:13:39 +0000 (9 23:13 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Apr 2016 01:33:59 +0000 (12 18:33 -0700) | ||
| tree | 908f4620c6dbef9aa2764afde24c75ba2b2fb3fb | treesnapshot (tar.gz zip) |
| parent | 7b0d47b3b6b5b64e02a5aa06b0452cadcdb18355 | commitdiff |
t7605: add a testcase demonstrating a bug with trivial merges
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>
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>
| t/t7605-merge-resolve.sh | diffblobblamehistory |