merge: pass aggressive when rename detection is turned off
Set aggressive flag in git_merge_trees() when rename detection is turned off. This allows read_tree() to auto resolve more cases that would have otherwise been handled by the rename detection. Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Ben Peart <benpeart@microsoft.com> Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ben Peart committed
May 2, 2018 at 16:01 UTC
6f10a09e0a1a7c3c3a6ee8e67390a4839dbe6a1b
1 file changed
+1
merge-recursive.c
+1
@@ -356,6 +356,7 @@ static int git_merge_trees(struct merge_options *o,
356
o->unpack_opts.fn = threeway_merge;
357
o->unpack_opts.src_index = &the_index;
358
o->unpack_opts.dst_index = &tmp_index;
359
+ o->unpack_opts.aggressive = !merge_detect_rename(o);
360
setup_unpack_trees_porcelain(&o->unpack_opts, "merge");
361
362
init_tree_desc_from_tree(t+0, common);