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>
Jeff King committed
Dec 18, 2019 at 12:25 UTC
8ebf5296611228a49605327021e6be74cc2fb4c9
1 file changed
+2
-12
pack-bitmap.c
+2
-12
@@ -1132,16 +1132,6 @@ void free_bitmap_index(struct bitmap_index *b)
1132
int bitmap_has_oid_in_uninteresting(struct bitmap_index *bitmap_git,
1133
const struct object_id *oid)
1134
{
1135
- int pos;
1136
-
1137
- if (!bitmap_git)
1138
- return 0; /* no bitmap loaded */
1139
- if (!bitmap_git->haves)
1140
- return 0; /* walk had no "haves" */
1141
-
1142
- pos = bitmap_position(bitmap_git, oid);
1143
- if (pos < 0)
1144
- return 0;
1145
-
1146
- return bitmap_get(bitmap_git->haves, pos);
1135
+ return bitmap_git &&
1136
+ bitmap_walk_contains(bitmap_git, bitmap_git->haves, oid);
1137
}