From: Elijah Newren <newren@gmail.com>
Date: Fri, 9 Jul 2010 13:10:54 +0000 (-0600)
Subject: merge_recursive: Fix renames across paths below D/F conflicts
X-Git-Tag: v1.7.3-rc0~30^2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5a2580d62f9aaa30f0acd10df9dbe7a581dd77d9?ds=inline;hp=5a2580d62f9aaa30f0acd10df9dbe7a581dd77d9

merge_recursive: Fix renames across paths below D/F conflicts

The rename logic in process_renames() handles renames and merging of file
contents and then marks files as processed.  However, there may be higher
stage entries left in the index for other reasons (e.g., due to D/F
conflicts).  By checking for such cases and marking the entry as not
processed, it allows process_entry() later to look at it and handle those
higher stages.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---