mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: avoid spurious rename/rename conflict from dir renames

Browse Source 
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>
This commit is contained in:
Elijah Newren
2018-04-19 10:58:15 -07:00
committed by Junio C Hamano
parent bc71c4eebe
commit 6e7e027fe5
2 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
merge-recursive.c
View File

@ -1992,7 +1992,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);
@ -2219,7 +2219,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;
}