Merge branch 'en/rename-progress'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Dec 2017 19:33:55 +0000 (11:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Dec 2017 19:33:55 +0000 (11:33 -0800)
commit646685460c26d56b149da91544e76150119d9c9b
tree849f52fe2d1497e9bf6bb57ea4d06f3d0e190be9
parent52015aaf9d19c97b52c47c7046058e6d029ff856
parent89973554b52cb533b01acfdcb16d8215344bf004
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
diff.c
progress.c
sequencer.c