diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-14 14:04:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-14 14:04:19 -0800 |
| commit | 03edb0a753fbdbfd14ae42a26ffd1e7608919c45 (patch) | |
| tree | 7417d5812b2c6c4969b69a31a42393982d0d9ddf /index-pack.c | |
| parent | dcb83ec18d5a79c438289eb55d9c01c61490d2e4 (diff) | |
| parent | a984a06a07cdd0a843eb6107ad56e346d99ac840 (diff) | |
| download | git-03edb0a753fbdbfd14ae42a26ffd1e7608919c45.tar.gz | |
Merge branch 'np/progress'
* np/progress:
nicer display of thin pack completion
make display of total transferred fully accurate
remove dead code from the csum-file interface
git-fetch: be even quieter.
make display of total transferred more accurate
sideband.c: ESC is spelled '\033' not '\e' for portability.
fix display overlap between remote and local progress
Diffstat (limited to 'index-pack.c')
| -rw-r--r-- | index-pack.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/index-pack.c b/index-pack.c index 3c99a1fce9..9fd6982a97 100644 --- a/index-pack.c +++ b/index-pack.c @@ -87,9 +87,9 @@ static void *fill(int min) die("early EOF"); die("read error on input: %s", strerror(errno)); } - if (from_stdin) - display_throughput(progress, ret); input_len += ret; + if (from_stdin) + display_throughput(progress, consumed_bytes + input_len); } while (input_len < min); return input_buffer; } @@ -792,6 +792,7 @@ int main(int argc, char **argv) flush(); } else { if (fix_thin_pack) { + char msg[48]; int nr_unresolved = nr_deltas - nr_resolved_deltas; int nr_objects_initial = nr_objects; if (nr_unresolved <= 0) @@ -800,12 +801,11 @@ int main(int argc, char **argv) (nr_objects + nr_unresolved + 1) * sizeof(*objects)); fix_unresolved_deltas(nr_unresolved); - stop_progress(&progress); - if (verbose) - fprintf(stderr, "%d objects were added to complete this thin pack.\n", - nr_objects - nr_objects_initial); + sprintf(msg, "completed with %d local objects", + nr_objects - nr_objects_initial); + stop_progress_msg(&progress, msg); fixup_pack_header_footer(output_fd, sha1, - curr_pack, nr_objects); + curr_pack, nr_objects); } if (nr_deltas != nr_resolved_deltas) die("pack has %d unresolved deltas", |