From: Elijah Newren <newren@gmail.com>
Date: Thu, 21 Dec 2017 19:19:05 +0000 (-0800)
Subject: t6044: recursive can silently incorporate dirty changes in a merge
X-Git-Tag: v2.16.0-rc1~7^2^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/eab3f2850e7cc63a8087fbeae608a1b72ea70c7b?ds=inline;hp=eab3f2850e7cc63a8087fbeae608a1b72ea70c7b

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>
---