From: Christian Couder Date: Wed, 18 Dec 2019 11:25:41 GMT Subject: [PATCH v4 06/12] pack-bitmap: simplify bitmap_has_oid_in_uninteresting() Message-ID: <20191218112547.4974-7-chriscool@tuxfamily.org> In-Reply-To: <20191218112547.4974-1-chriscool@tuxfamily.org> From: Jeff King Let's refactor bitmap_has_oid_in_uninteresting() using bitmap_walk_contains(). Signed-off-by: Jeff King Signed-off-by: Christian Couder --- pack-bitmap.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pack-bitmap.c b/pack-bitmap.c index de65f2fc36..0bbc651dde 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -1130,16 +1130,6 @@ void free_bitmap_index(struct bitmap_index *b) int bitmap_has_oid_in_uninteresting(struct bitmap_index *bitmap_git, const struct object_id *oid) { - int pos; - - if (!bitmap_git) - return 0; /* no bitmap loaded */ - if (!bitmap_git->haves) - return 0; /* walk had no "haves" */ - - pos = bitmap_position(bitmap_git, oid); - if (pos < 0) - return 0; - - return bitmap_get(bitmap_git->haves, pos); + return bitmap_git && + bitmap_walk_contains(bitmap_git, bitmap_git->haves, oid); } -- 2.24.1.498.g561400140f