merge-recursive: ensure we write updates for directory-renamed file
authorElijah Newren <newren@gmail.com>
Wed, 14 Feb 2018 18:52:06 +0000 (10:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 22:11:58 +0000 (14:11 -0800)
commitc5b761fb2711542073cf1906c0e86a34616b79ae
treef127a060756cb53996de66d88e58a8d740118bdf
parentfebb3a86098f853066c2623c2392f156710dd40f
merge-recursive: ensure we write updates for directory-renamed file

When a file is present in HEAD before the merge and the other side of the
merge does not modify that file, we try to avoid re-writing the file and
making it stat-dirty.  However, when a file is present in HEAD before the
merge and was in a directory that was renamed by the other side of the
merge, we have to move the file to a new location and re-write it.
Update the code that checks whether we can skip the update to also work in
the presence of directory renames.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c
t/t6043-merge-rename-directories.sh