summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2016-04-10 06:13:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-13 01:33:59 (GMT)
commitef7d3621d76fe210827698cba79c737906048191 (patch)
tree908f4620c6dbef9aa2764afde24c75ba2b2fb3fb /builtin/merge.c
parent7b0d47b3b6b5b64e02a5aa06b0452cadcdb18355 (diff)
downloadgit-ef7d3621d76fe210827698cba79c737906048191.zip
git-ef7d3621d76fe210827698cba79c737906048191.tar.gz
git-ef7d3621d76fe210827698cba79c737906048191.tar.bz2
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>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions