kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
René Scharfe 2018-03-24 17:41:08 +01:00 committed by Junio C Hamano
parent 0aaf05b3bd
commit 902f5a2119
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sha1_name.c
View File

@ -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, static void unique_in_pack(struct packed_git *p,
struct disambiguate_state *ds) struct disambiguate_state *ds)
{ {
uint32_t num, last, i, first = 0; uint32_t num, i, first = 0;
const struct object_id *current = NULL; const struct object_id *current = NULL;


if (open_pack_index(p) || !p->num_objects) if (open_pack_index(p) || !p->num_objects)
return; return;


num = p->num_objects; num = p->num_objects;
last = num; bsearch_pack(&ds->bin_pfx, p, &first);
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;
}


/* /*
* At this point, "first" is the location of the lowest object * At this point, "first" is the location of the lowest object