diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-07 00:03:36 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-07 00:03:36 +0300 |
| commit | 20fbf7dd421d05399dfe916edf8eed1932b15e22 (patch) | |
| tree | d5b5cb5328fef4176ccc2d09be1172ac8de89a02 /merge-recursive.c | |
| parent | 74583d89127e21255c12dd3c8a3bf60b497d7d03 (diff) | |
| parent | 481de8a293bfaa5425ea4dc5ac70aaf3081a3be8 (diff) | |
Merge branch 'en/merge-directory-renames-fix'
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
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index a7bcfcbeb4..d2e380b7ed 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -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, |