diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-12-19 11:33:55 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-12-19 11:33:55 -0800 |
commit | 646685460c26d56b149da91544e76150119d9c9b (patch) | |
tree | 849f52fe2d1497e9bf6bb57ea4d06f3d0e190be9 /diff.c | |
parent | RelNotes: minor typo fixes in 2.16.0 draft (diff) | |
parent | diffcore-rename: make diff-tree -l0 mean -l<large> (diff) | |
download | tgif-646685460c26d56b149da91544e76150119d9c9b.tar.xz |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); } |