]> git.ipfire.org Git - thirdparty/git.git/commitdiff
pack-bitmap.c: teach `show_objects_for_type()` about incremental MIDXs
authorTaylor Blau <me@ttaylorr.com>
Thu, 20 Mar 2025 17:56:40 +0000 (13:56 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Mar 2025 11:33:45 +0000 (04:33 -0700)
Since we may ask for a pack_id that is in an earlier MIDX layer relative
to the one corresponding to our bitmap, use nth_midxed_pack() instead of
accessing the ->packs array directly.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Acked-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
pack-bitmap.c

index 17f1087fba33c470ce38dbcbcbc8c0994546b24c..f3ef9e43ef8a16090252abb6543656accabfd7ab 100644 (file)
@@ -1636,7 +1636,7 @@ static void show_objects_for_type(
                                nth_midxed_object_oid(&oid, m, index_pos);
 
                                pack_id = nth_midxed_pack_int_id(m, index_pos);
-                               pack = bitmap_git->midx->packs[pack_id];
+                               pack = nth_midxed_pack(bitmap_git->midx, pack_id);
                        } else {
                                index_pos = pack_pos_to_index(bitmap_git->pack, pos + offset);
                                ofs = pack_pos_to_offset(bitmap_git->pack, pos + offset);