diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-04-20 17:23:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-20 17:23:35 -0700 |
| commit | 2eebac2c496dae01899900e98809ab15d87e1dd1 (patch) | |
| tree | 57b9e98233a73d7456ae456110b7e4009a5bb20e /builtin/pack-objects.c | |
| parent | Merge branch 'ab/userdiff-tests' (diff) | |
| parent | pack-objects: update "nr_seen" progress based on pack-reused count (diff) | |
| download | tgif-2eebac2c496dae01899900e98809ab15d87e1dd1.tar.xz | |
Merge branch 'jk/pack-objects-bitmap-progress-fix'
When "git pack-objects" makes a literal copy of a part of existing
packfile using the reachability bitmaps, its update to the progress
meter was broken.
* jk/pack-objects-bitmap-progress-fix:
pack-objects: update "nr_seen" progress based on pack-reused count
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index a1e33d7507..247a08d024 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -3527,7 +3527,8 @@ static int get_object_list_from_bitmap(struct rev_info *revs) &reuse_packfile_bitmap)) { assert(reuse_packfile_objects); nr_result += reuse_packfile_objects; - display_progress(progress_state, nr_result); + nr_seen += reuse_packfile_objects; + display_progress(progress_state, nr_seen); } traverse_bitmap_commit_list(bitmap_git, revs, |