diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-11 23:20:04 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:37 -0700 |
| commit | 0a6b87126e6a4e2649f6da23db67eeaad11d102e (patch) | |
| tree | 032427c161ac3445f35ec8426a48a5bd163b7cbc /t/t4013/diff.format-patch_--inline_--stdout_initial..master | |
| parent | merge-recursive: Fix deletion of untracked file in rename/delete conflicts (diff) | |
| download | git-0a6b87126e6a4e2649f6da23db67eeaad11d102e.tar.gz git-0a6b87126e6a4e2649f6da23db67eeaad11d102e.zip | |
merge-recursive: Make dead code for rename/rename(2to1) conflicts undead
The code for rename_rename_2to1 conflicts (two files both being renamed to
the same filename) was dead since the rename/add path was always being
independently triggered for each of the renames instead. Further,
reviving the dead code showed that it was inherently buggy and would
always segfault -- among a few other bugs.
Move the else-if branch for the rename/rename block before the rename/add
block to make sure it is checked first, and fix up the rename/rename(2to1)
code segments to make it handle most cases. Work is still needed to
handle higher dimensional corner cases such as rename/rename/modify/modify
issues.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..master')
0 files changed, 0 insertions, 0 deletions