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 <peff@peff.net>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/pack-bitmap.c b/pack-bitmap.c
index b6f5fa1fc6f0d5a900a3fa9c668fb0a6cb6cdf18..41330a461ecd9fa11142f4d1ba89570defd89bb9 100644 (file)
--- 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);
 }