From: Ben Peart <Ben.Peart@microsoft.com>
Date: Wed, 2 May 2018 16:01:16 +0000 (+0000)
Subject: merge: pass aggressive when rename detection is turned off
X-Git-Tag: v2.18.0-rc0~31^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6f10a09e0a1a7c3c3a6ee8e67390a4839dbe6a1b

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>
---

diff --git a/merge-recursive.c b/merge-recursive.c
index e98404964d..680e01226b 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -356,6 +356,7 @@ static int git_merge_trees(struct merge_options *o,
 	o->unpack_opts.fn = threeway_merge;
 	o->unpack_opts.src_index = &the_index;
 	o->unpack_opts.dst_index = &tmp_index;
+	o->unpack_opts.aggressive = !merge_detect_rename(o);
 	setup_unpack_trees_porcelain(&o->unpack_opts, "merge");
 
 	init_tree_desc_from_tree(t+0, common);