Skip to content

Commit 59b2829

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Christian Couder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 40d18ff commit 59b2829

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

pack-bitmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1139,7 +1139,7 @@ int bitmap_has_oid_in_uninteresting(struct bitmap_index *bitmap_git,
11391139
if (!bitmap_git->haves)
11401140
return 0; /* walk had no "haves" */
11411141

1142-
pos = bitmap_position_packfile(bitmap_git, oid);
1142+
pos = bitmap_position(bitmap_git, oid);
11431143
if (pos < 0)
11441144
return 0;
11451145

0 commit comments

Comments
 (0)