diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-07-09 07:10:54 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-07-09 16:13:00 -0700 |
| commit | 5a2580d62f9aaa30f0acd10df9dbe7a581dd77d9 (patch) | |
| tree | f43bd060dd324f749f7d909e27eda7762cd52d84 /t/t7006 | |
| parent | merge-recursive: Fix D/F conflicts (diff) | |
| download | tgif-5a2580d62f9aaa30f0acd10df9dbe7a581dd77d9.tar.xz | |
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>
Diffstat (limited to 't/t7006')
0 files changed, 0 insertions, 0 deletions