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

Merge branch 'en/merge-dir-rename-corner-case-fix'

Browse Source 
The merge code had funny interactions between content based rename
detection and directory rename detection.

* en/merge-dir-rename-corner-case-fix:
  merge-recursive: handle rename-to-self case
  merge-ort: ensure we consult df_conflict and path_conflicts
  t6423: test directory renames causing rename-to-self
This commit is contained in:
Junio C Hamano
2021-07-16 17:42:45 -07:00
parent fdbcdfcf61 3585d0ea23
commit d3b88be1b4
3 changed files with 193 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
merge-recursive.c
View File

@ -2804,12 +2804,19 @@ static int process_renames(struct merge_options *opt,
int renamed_stage = a_renames == renames1 ? 2 : 3;
int other_stage = a_renames == renames1 ? 3 : 2;
/*
* Directory renames have a funny corner case...
*/
int renamed_to_self = !strcmp(ren1_src, ren1_dst);
/* BUG: We should only remove ren1_src in the base
* stage and in other_stage (think of rename +
* add-source case).
*/
remove_file(opt, 1, ren1_src,
renamed_stage == 2 || !was_tracked(opt, ren1_src));
if (!renamed_to_self)
remove_file(opt, 1, ren1_src,
renamed_stage == 2 ||
!was_tracked(opt, ren1_src));
oidcpy(&src_other.oid,
&ren1->src_entry->stages[other_stage].oid);
@ -2823,6 +2830,9 @@ static int process_renames(struct merge_options *opt,
ren1->dir_rename_original_type == 'A') {
setup_rename_conflict_info(RENAME_VIA_DIR,
opt, ren1, NULL);
} else if (renamed_to_self) {
setup_rename_conflict_info(RENAME_NORMAL,
opt, ren1, NULL);
} else if (oideq(&src_other.oid, null_oid())) {
setup_rename_conflict_info(RENAME_DELETE,
opt, ren1, NULL);
@ -3180,7 +3190,6 @@ static int handle_rename_normal(struct merge_options *opt,
struct rename *ren = ci->ren1;
struct merge_file_info mfi;
int clean;
int side = (ren->branch == opt->branch1 ? 2 : 3);
/* Merge the content and write it out */
clean = handle_content_merge(&mfi, opt, path, was_dirty(opt, path),
@ -3190,9 +3199,7 @@ static int handle_rename_normal(struct merge_options *opt,
opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_CONFLICT &&
ren->dir_rename_original_dest) {
if (update_stages(opt, path,
NULL,
side == 2 ? &mfi.blob : NULL,
side == 2 ? NULL : &mfi.blob))
&mfi.blob, &mfi.blob, &mfi.blob))
return -1;
clean = 0; /* not clean, but conflicted */
}