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>
Elijah Newren committed
Nov 13, 2017 at 12:15 UTC
b520abf1c8f3dcbd218c9ae26830b7e2c94866c7
1 file changed
+1
sequencer.c
+1
@@ -462,6 +462,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
462
if (is_rebase_i(opts) && clean <= 0)
463
fputs(o.obuf.buf, stdout);
464
strbuf_release(&o.obuf);
465
+ diff_warn_rename_limit("merge.renamelimit", o.needed_rename_limit, 0);
466
if (clean < 0)
467
return clean;
468