summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-19 19:33:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-12-19 19:33:55 (GMT)
commit646685460c26d56b149da91544e76150119d9c9b (patch)
tree849f52fe2d1497e9bf6bb57ea4d06f3d0e190be9 /diff.c
parent52015aaf9d19c97b52c47c7046058e6d029ff856 (diff)
parent89973554b52cb533b01acfdcb16d8215344bf004 (diff)
downloadgit-646685460c26d56b149da91544e76150119d9c9b.zip
git-646685460c26d56b149da91544e76150119d9c9b.tar.gz
git-646685460c26d56b149da91544e76150119d9c9b.tar.bz2
Merge branch 'en/rename-progress'
Historically, the diff machinery for rename detection had a hardcoded limit of 32k paths; this is being lifted to allow users trade cycles with a (possibly) easier to read result. * en/rename-progress: diffcore-rename: make diff-tree -l0 mean -l<large> sequencer: show rename progress during cherry picks diff: remove silent clamp of renameLimit progress: fix progress meters when dealing with lots of work sequencer: warn when internal merge may be suboptimal due to renameLimit
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 2ebe222..b3ef25c 100644
--- a/diff.c
+++ b/diff.c
@@ -5454,7 +5454,7 @@ void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc)
warning(_(rename_limit_warning));
else
return;
- if (0 < needed && needed < 32767)
+ if (0 < needed)
warning(_(rename_limit_advice), varname, needed);
}