diff options
| author | Jeff King <peff@peff.net> | 2019-12-18 11:25:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-23 18:51:50 (GMT) |
| commit | 59b2829ec535b6c33edc32526ddb9b9b7e86a5a3 (patch) | |
| tree | a2d97301386e0e04a38bd6e73fb3ea9705cec3e7 /pack-bitmap.c | |
| parent | 40d18ff8c6b6977eaf8450dc4eeb866ece5298fc (diff) | |
| download | git-59b2829ec535b6c33edc32526ddb9b9b7e86a5a3.zip git-59b2829ec535b6c33edc32526ddb9b9b7e86a5a3.tar.gz git-59b2829ec535b6c33edc32526ddb9b9b7e86a5a3.tar.bz2 | |
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 <peff@peff.net>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-bitmap.c')
| -rw-r--r-- | pack-bitmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pack-bitmap.c b/pack-bitmap.c index 8891797..b6f5fa1 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; |