[PATCH v2 1/4] sequencer: warn when internal merge may be suboptimal due to renameLimit

From: Elijah Newren <newren@gmail.com>
Date: Nov 13, 2017, 20:15 UTC
Message-ID: <20171113201600.24878-2-newren@gmail.com>
In-Reply-To: <20171113201600.24878-1-newren@gmail.com>

When many files were renamed, the recursive merge strategy stopped detecting renames and left many paths with delete/modify conflicts, without any warning about what was going on or providing any hints about how to tell Git to spend more cycles to detect renames.

Signed-off-by: Elijah Newren <newren@gmail.com>
---
 sequencer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sequencer.c b/sequencer.c
index f2a10cc4f2..2b4cecb617 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -462,6 +462,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
 	if (is_rebase_i(opts) && clean <= 0)
 		fputs(o.obuf.buf, stdout);
 	strbuf_release(&o.obuf);
+	diff_warn_rename_limit("merge.renamelimit", o.needed_rename_limit, 0);
 	if (clean < 0)
 		return clean;

-- 
2.15.0.44.gf995e411c7