[PATCH v4 3/3] merge: pass aggressive when rename detection is turned off
From: Ben Peart <hidden>
Date: 2018-05-02 16:01:27
Subsystem:
the rest · Maintainer:
Linus Torvalds
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> --- merge-recursive.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/merge-recursive.c b/merge-recursive.c
index 372ffbbacc..cea054cfd4 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c@@ -355,6 +355,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 = &the_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);
--
2.17.0.windows.1