diff options
| author | Jeff King <peff@peff.net> | 2019-12-18 11:25:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-23 18:51:50 (GMT) |
| commit | 8ebf5296611228a49605327021e6be74cc2fb4c9 (patch) | |
| tree | bb82ec2a097948109cd66f34eb2fab075945bed1 /pack-bitmap.c | |
| parent | 59b2829ec535b6c33edc32526ddb9b9b7e86a5a3 (diff) | |
| download | git-8ebf5296611228a49605327021e6be74cc2fb4c9.zip git-8ebf5296611228a49605327021e6be74cc2fb4c9.tar.gz git-8ebf5296611228a49605327021e6be74cc2fb4c9.tar.bz2 | |
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>
Diffstat (limited to 'pack-bitmap.c')
| -rw-r--r-- | pack-bitmap.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pack-bitmap.c b/pack-bitmap.c index b6f5fa1..41330a4 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); } |