diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-04-19 10:58:15 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-08 16:11:00 +0900 |
| commit | 6e7e027fe5f4a8d61597a86e7f2b6087e23a759c (patch) | |
| tree | 6b588b3c6e42ded8aad682c31b51dc437da34af9 /unpack-trees.c | |
| parent | directory rename detection: new testcases showcasing a pair of bugs (diff) | |
| download | tgif-6e7e027fe5f4a8d61597a86e7f2b6087e23a759c.tar.xz | |
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 'unpack-trees.c')
0 files changed, 0 insertions, 0 deletions