diff options
| author | Ben Peart <Ben.Peart@microsoft.com> | 2018-05-02 18:01:16 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 09:19:41 +0200 |
| commit | 6f10a09e0a1a7c3c3a6ee8e67390a4839dbe6a1b (patch) | |
| tree | 5cb72e35306adadac40d3dabfdb7fdc18d54fba1 /merge-recursive.c | |
| parent | merge: add merge.renames config setting (diff) | |
| download | git-6f10a09e0a1a7c3c3a6ee8e67390a4839dbe6a1b.tar.xz git-6f10a09e0a1a7c3c3a6ee8e67390a4839dbe6a1b.zip | |
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>
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 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); |