diff options
| author | Elijah Newren <newren@gmail.com> | 2018-02-14 10:52:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 14:11:58 -0800 |
| commit | febb3a86098f853066c2623c2392f156710dd40f (patch) | |
| tree | 291b95abe28dfa2508eb5e951cecef25450ff77a /builtin/commit-tree.c | |
| parent | 8f581e3a470fa92e99b28974f68ee2d23230d1c9 (diff) | |
merge-recursive: avoid spurious rename/rename conflict from dir renames
If a file on one side of history was renamed, and merely modified on the
other side, then applying a directory rename to the modified side gives us
a rename/rename(1to2) conflict. We should only apply directory renames to
pairs representing either adds or renames.
Making this change means that a directory rename testcase that was
previously reported as a rename/delete conflict will now be reported as a
modify/delete conflict.
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit-tree.c')
0 files changed, 0 insertions, 0 deletions