From: Jeff King Date: Wed, 18 Dec 2019 11:25:40 +0000 (+0100) Subject: pack-bitmap: uninteresting oid can be outside bitmapped packfile X-Git-Tag: v2.26.0-rc0~67^2~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59b2829ec535b6c33edc32526ddb9b9b7e86a5a3;p=thirdparty%2Fgit.git pack-bitmap: uninteresting oid can be outside bitmapped packfile bitmap_has_oid_in_uninteresting() only used bitmap_position_packfile(), not bitmap_position(). So it wouldn't find objects which weren't in the bitmapped packfile (i.e., ones where we extended the bitmap to handle loose objects, or objects in other packs). As we could reuse a delta against such an object it is suboptimal not to use bitmap_position(), so let's use it instead of bitmap_position_packfile(). Signed-off-by: Jeff King Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- diff --git a/pack-bitmap.c b/pack-bitmap.c index 8891797c00..b6f5fa1fc6 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -1139,7 +1139,7 @@ int bitmap_has_oid_in_uninteresting(struct bitmap_index *bitmap_git, if (!bitmap_git->haves) return 0; /* walk had no "haves" */ - pos = bitmap_position_packfile(bitmap_git, oid); + pos = bitmap_position(bitmap_git, oid); if (pos < 0) return 0;