This patchset fixes some issues around rename detection limits. Changes since the original submission[1]: * Patches 2 and 3 are swapped in order so as to not temporarily introduce any bugs (even if only cosmetic) * Commit message fixups * Using uint64_t instead of double for holding multiplication of integers * Corrected format specifier for printing 64-bit ints. [1] https://public-inbox.org/git/20171110173956.25105-1-newren@xxxxxxxxx/ Elijah Newren (4): sequencer: warn when internal merge may be suboptimal due to renameLimit progress: fix progress meters when dealing with lots of work Remove silent clamp of renameLimit sequencer: show rename progress during cherry picks diff.c | 2 +- diffcore-rename.c | 15 ++++++--------- progress.c | 22 +++++++++++----------- progress.h | 8 ++++---- sequencer.c | 2 ++ 5 files changed, 24 insertions(+), 25 deletions(-) -- 2.15.0.44.gf995e411c7