diff options
| author | Elijah Newren <newren@gmail.com> | 2017-11-13 21:15:57 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-14 03:37:24 +0100 |
| commit | b520abf1c8f3dcbd218c9ae26830b7e2c94866c7 (patch) | |
| tree | 55ec05cc6a0fdb2e803433ee8445ea89b12dbd69 /sequencer.c | |
| parent | Merge branch 'jm/status-ignored-files-list' (diff) | |
| download | git-b520abf1c8f3dcbd218c9ae26830b7e2c94866c7.tar.xz git-b520abf1c8f3dcbd218c9ae26830b7e2c94866c7.zip | |
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>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; |