mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/pack-objects-bitmap-progress-fix'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2021-04-20 17:23:35 -07:00
parent ab99efc817 8e118e8490
commit 2eebac2c49
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/pack-objects.c
View File

@ -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,