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

Merge branch 'en/merge-directory-renames-fix'

Browse Source 
Recent code restructuring of merge-recursive engine introduced a
regression dealing with rename/add conflict.

* en/merge-directory-renames-fix:
  merge-recursive: restore accidentally dropped setting of path
This commit is contained in:
Junio C Hamano
2019-06-06 14:03:36 -07:00
parent 74583d8912 481de8a293
commit 20fbf7dd42
2 changed files with 117 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
merge-recursive.c
View File

@ -1660,6 +1660,7 @@ static int handle_rename_add(struct merge_options *opt,
c->path, add_branch);
prev_path_desc = xstrfmt("version of %s from %s", path, a->path);
ci->ren1->src_entry->stages[other_stage].path = a->path;
if (merge_mode_and_contents(opt, a, c,
&ci->ren1->src_entry->stages[other_stage],
prev_path_desc,