From: Jeff King <redacted>
Date: Wed, 18 Dec 2019 11:25:41 +0000 (+0100)
Subject: pack-bitmap: simplify bitmap_has_oid_in_uninteresting()
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=8ebf5296611228a49605327021e6be74cc2fb4c9;p=git.git

pack-bitmap: simplify bitmap_has_oid_in_uninteresting()

Let's refactor bitmap_has_oid_in_uninteresting() using
bitmap_walk_contains().

Signed-off-by: Jeff King <redacted>
Signed-off-by: Christian Couder <redacted>
Signed-off-by: Junio C Hamano <redacted>
---

diff --git a/pack-bitmap.c b/pack-bitmap.c
index b6f5fa1fc6..41330a461e 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -1132,16 +1132,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);
 }