Skip to content

Commit

Permalink
Merge branch 'jn/maint-fast-import-object-reuse' into maint
Browse files Browse the repository at this point in the history
* jn/maint-fast-import-object-reuse:
  fast-import: insert new object entries at start of hash bucket
  • Loading branch information
Junio C Hamano committed Jan 19, 2011
2 parents f326a06 + b7c1ce4 commit 267684f
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions fast-import.c
Original file line number Diff line number Diff line change
Expand Up @@ -539,22 +539,17 @@ static struct object_entry *insert_object(unsigned char *sha1)
{
unsigned int h = sha1[0] << 8 | sha1[1];
struct object_entry *e = object_table[h];
struct object_entry *p = NULL;

while (e) {
if (!hashcmp(sha1, e->idx.sha1))
return e;
p = e;
e = e->next;
}

e = new_object(sha1);
e->next = NULL;
e->next = object_table[h];
e->idx.offset = 0;
if (p)
p->next = e;
else
object_table[h] = e;
object_table[h] = e;
return e;
}

Expand Down

0 comments on commit 267684f

Please sign in to comment.