From: Elijah Newren <newren@gmail.com>
Date: Mon, 13 Nov 2017 20:15:57 +0000 (-0800)
Subject: sequencer: warn when internal merge may be suboptimal due to renameLimit
X-Git-Tag: v2.16.0-rc0~50^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b520abf1c8f3dcbd218c9ae26830b7e2c94866c7?hp=-c

sequencer: warn when internal merge may be suboptimal due to renameLimit

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

b520abf1c8f3dcbd218c9ae26830b7e2c94866c7
diff --git a/sequencer.c b/sequencer.c
index 6d027b06c8..1aa769c82d 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;