]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3013dff) | patch
t6044: recursive can silently incorporate dirty changes in a merge
authorElijah Newren <newren@gmail.com>
Thu, 21 Dec 2017 19:19:05 +0000 (11:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Dec 2017 20:14:16 +0000 (12:14 -0800)
commiteab3f2850e7cc63a8087fbeae608a1b72ea70c7b
treef9aa7db390af8ce63c23e583a4cc54ba83389303tree | snapshot
parent3013dff8662eae06457fe6e5348dfe2270810ab2commit | diff
t6044: recursive can silently incorporate dirty changes in a merge

The recursive merge strategy has some special handling when the tree for
the merge branch exactly matches the merge base, but that code path is
missing checks for the index having changes relative to HEAD.  Add a
testcase covering this scenario.

Reported-by: Andreas Krey <a.krey@gmx.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6044-merge-unrelated-index-changes.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.