Browse Source

Keep the parents in order when parsing commits

We used to keep the parents in reverse order in the commit_list.  Most
users don't care, but it's wrong, and the next commit does care.
maint
Linus Torvalds 20 years ago
parent
commit
6c88be1698
  1. 4
      commit.c

4
commit.c

@ -63,6 +63,7 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
{ {
void *bufptr = buffer; void *bufptr = buffer;
unsigned char parent[20]; unsigned char parent[20];
struct commit_list **pptr;


if (item->object.parsed) if (item->object.parsed)
return 0; return 0;
@ -72,11 +73,12 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
if (item->tree) if (item->tree)
add_ref(&item->object, &item->tree->object); add_ref(&item->object, &item->tree->object);
bufptr += 46; /* "tree " + "hex sha1" + "\n" */ bufptr += 46; /* "tree " + "hex sha1" + "\n" */
pptr = &item->parents;
while (!memcmp(bufptr, "parent ", 7) && while (!memcmp(bufptr, "parent ", 7) &&
!get_sha1_hex(bufptr + 7, parent)) { !get_sha1_hex(bufptr + 7, parent)) {
struct commit *new_parent = lookup_commit(parent); struct commit *new_parent = lookup_commit(parent);
if (new_parent) { if (new_parent) {
commit_list_insert(new_parent, &item->parents); pptr = &commit_list_insert(new_parent, pptr)->next;
add_ref(&item->object, &new_parent->object); add_ref(&item->object, &new_parent->object);
} }
bufptr += 48; bufptr += 48;

Loading…
Cancel
Save