]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tb/boundary-traversal-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 Dec 2024 01:14:43 +0000 (10:14 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 Dec 2024 01:14:44 +0000 (10:14 +0900)
A trivial "correctness" fix that does not yet matter in practice.

* tb/boundary-traversal-fix:
  pack-bitmap.c: typofix in `find_boundary_objects()`

1  2 
pack-bitmap.c

diff --cc pack-bitmap.c
index 4fa9dfc771a30545281b8a5e2b7d26dc5682c285,878f378016b23a9ca954d36867692db64e2cb23a..683f4670519ff3a96f0c6c5a1ac36ba64ad6e2b0
@@@ -1265,12 -1143,9 +1265,12 @@@ static struct bitmap *find_boundary_obj
        if (!any_missing)
                goto cleanup;
  
 +      if (existing_bitmaps)
 +              cascade_pseudo_merges_1(bitmap_git, cb.base, NULL);
 +
        tmp_blobs = revs->blob_objects;
        tmp_trees = revs->tree_objects;
-       tmp_tags = revs->blob_objects;
+       tmp_tags = revs->tag_objects;
        revs->blob_objects = 0;
        revs->tree_objects = 0;
        revs->tag_objects = 0;