From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 Dec 2024 01:14:43 +0000 (+0900)
Subject: Merge branch 'tb/boundary-traversal-fix'
X-Git-Tag: v2.48.0-rc0~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a0712e05f12d95478671f314a4296ae18dbb664;p=thirdparty%2Fgit.git

Merge branch 'tb/boundary-traversal-fix'

A trivial "correctness" fix that does not yet matter in practice.

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

0a0712e05f12d95478671f314a4296ae18dbb664
diff --cc pack-bitmap.c
index 4fa9dfc771,878f378016..683f467051
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@@ -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;