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 /progress.h | |
| 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 'progress.h')
| -rw-r--r-- | progress.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/progress.h b/progress.h index 6392b63371..70a4d4a0d6 100644 --- a/progress.h +++ b/progress.h @@ -3,10 +3,10 @@ struct progress; -void display_throughput(struct progress *progress, off_t total); -int display_progress(struct progress *progress, unsigned n); -struct progress *start_progress(const char *title, unsigned total); -struct progress *start_delayed_progress(const char *title, unsigned total); +void display_throughput(struct progress *progress, uint64_t total); +int display_progress(struct progress *progress, uint64_t n); +struct progress *start_progress(const char *title, uint64_t total); +struct progress *start_delayed_progress(const char *title, uint64_t total); void stop_progress(struct progress **progress); void stop_progress_msg(struct progress **progress, const char *msg); |