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 <redacted>
Signed-off-by: Ben Peart <redacted>
Reviewed-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/merge-recursive.c b/merge-recursive.c
index e98404964da7af9496fadf78b349bcf3c7a97832..680e01226b2ecb68d2b8199378a055ce622f0cb7 100644 (file)
--- 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);