From febb3a86098f853066c2623c2392f156710dd40f Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Wed, 14 Feb 2018 10:52:05 -0800 Subject: 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 Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- merge-recursive.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'merge-recursive.c') diff --git a/merge-recursive.c b/merge-recursive.c index 03ff67bf8f..4a1ecdea03 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; } -- cgit 1.2.3-korg