Commit abd7ccdd authored by Junio C Hamano's avatar Junio C Hamano

Merge branch 'jt/fetch-pack-wanted-refs-optim'

Performance fix around "git fetch" that grabs many refs.

* jt/fetch-pack-wanted-refs-optim:
  fetch-pack: binary search when storing wanted-refs
parents 8baf40b5 b7643009
......@@ -1298,6 +1298,11 @@ static void receive_shallow_info(struct fetch_pack_args *args,
static int cmp_name_ref(const void *name, const void *ref)
return strcmp(name, (*(struct ref **)ref)->name);
static void receive_wanted_refs(struct packet_reader *reader,
struct ref **sought, int nr_sought)
......@@ -1305,20 +1310,16 @@ static void receive_wanted_refs(struct packet_reader *reader,
while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
struct object_id oid;
const char *end;
int i;
struct ref **found;
if (parse_oid_hex(reader->line, &oid, &end) || *end++ != ' ')
die(_("expected wanted-ref, got '%s'"), reader->line);
for (i = 0; i < nr_sought; i++) {
if (!strcmp(end, sought[i]->name)) {
oidcpy(&sought[i]->old_oid, &oid);
if (i == nr_sought)
found = bsearch(end, sought, nr_sought, sizeof(*sought),
if (!found)
die(_("unexpected wanted-ref: '%s'"), reader->line);
oidcpy(&(*found)->old_oid, &oid);
if (reader->status != PACKET_READ_DELIM)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment