diff options
| author | Elijah Newren <newren@gmail.com> | 2018-02-14 18:52:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 22:11:58 (GMT) |
| commit | febb3a86098f853066c2623c2392f156710dd40f (patch) | |
| tree | 291b95abe28dfa2508eb5e951cecef25450ff77a /merge-recursive.c | |
| parent | 8f581e3a470fa92e99b28974f68ee2d23230d1c9 (diff) | |
| download | git-febb3a86098f853066c2623c2392f156710dd40f.zip git-febb3a86098f853066c2623c2392f156710dd40f.tar.gz git-febb3a86098f853066c2623c2392f156710dd40f.tar.bz2 | |
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 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 03ff67b..4a1ecde 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1982,7 +1982,7 @@ static void compute_collisions(struct hashmap *collisions, char *new_path; struct diff_filepair *pair = pairs->queue[i]; - if (pair->status == 'D') + if (pair->status != 'A' && pair->status != 'R') continue; dir_rename_ent = check_dir_renamed(pair->two->path, dir_renames); @@ -2209,7 +2209,7 @@ static struct string_list *get_renames(struct merge_options *o, struct diff_filepair *pair = pairs->queue[i]; char *new_path; /* non-NULL only with directory renames */ - if (pair->status == 'D') { + if (pair->status != 'A' && pair->status != 'R') { diff_free_filepair(pair); continue; } |