| commit | 5a2580d62f9aaa30f0acd10df9dbe7a581dd77d9 | |
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 9 Jul 2010 13:10:54 +0000 (9 07:10 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 Jul 2010 23:13:00 +0000 (9 16:13 -0700) | ||
| tree | f43bd060dd324f749f7d909e27eda7762cd52d84 | treesnapshot (tar.gz zip) |
| parent | 37348937ff391f01981e8af10b2f615268fd2509 | commitdiff |
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>
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>
| merge-recursive.c | diffblobblamehistory | |
| t/t3509-cherry-pick-merge-df.sh | diffblobblamehistory | |
| t/t6020-merge-df.sh | diffblobblamehistory |