diff options
| author | René Scharfe <l.s.r@web.de> | 2018-03-24 16:41:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-25 16:18:15 (GMT) |
| commit | 902f5a2119089472c905407cb0a9b3886d032ebd (patch) | |
| tree | 367740a5259e9ffe5bfd32f2eaea06f31688a6d1 | |
| parent | 0aaf05b3bdc1ce48bed9f8dcba54153a2b7cdc09 (diff) | |
| download | git-902f5a2119089472c905407cb0a9b3886d032ebd.zip git-902f5a2119089472c905407cb0a9b3886d032ebd.tar.gz git-902f5a2119089472c905407cb0a9b3886d032ebd.tar.bz2 | |
sha1_name: use bsearch_pack() in unique_in_pack()
Replace the custom binary search in unique_in_pack() with a call to
bsearch_pack(). This reduces code duplication and makes use of the
fan-out table of packs.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | sha1_name.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/sha1_name.c b/sha1_name.c index 24894b3..0185c60 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -150,31 +150,14 @@ static int match_sha(unsigned len, const unsigned char *a, const unsigned char * static void unique_in_pack(struct packed_git *p, struct disambiguate_state *ds) { - uint32_t num, last, i, first = 0; + uint32_t num, i, first = 0; const struct object_id *current = NULL; if (open_pack_index(p) || !p->num_objects) return; num = p->num_objects; - last = num; - while (first < last) { - uint32_t mid = first + (last - first) / 2; - const unsigned char *current; - int cmp; - - current = nth_packed_object_sha1(p, mid); - cmp = hashcmp(ds->bin_pfx.hash, current); - if (!cmp) { - first = mid; - break; - } - if (cmp > 0) { - first = mid+1; - continue; - } - last = mid; - } + bsearch_pack(&ds->bin_pfx, p, &first); /* * At this point, "first" is the location of the lowest object |