summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Linus Torvalds <torvalds@ppc970.osdl.org>2005-06-20 20:26:03 -0700
committerLibravatar Linus Torvalds <torvalds@ppc970.osdl.org>2005-06-20 20:26:03 -0700
commit6c88be169881c9223532796bd225e79afaa115e1 (patch)
tree588f29f7768a9109425888297b357d5b771db1e9
parentgit-rev-parse: flush "default" head when encountering something unexpected (diff)
downloadtgif-6c88be169881c9223532796bd225e79afaa115e1.tar.xz
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.
-rw-r--r--commit.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/commit.c b/commit.c
index 60047a06d3..738590f31a 100644
--- a/commit.c
+++ b/commit.c
@@ -63,6 +63,7 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
{
void *bufptr = buffer;
unsigned char parent[20];
+ struct commit_list **pptr;
if (item->object.parsed)
return 0;
@@ -72,11 +73,12 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
if (item->tree)
add_ref(&item->object, &item->tree->object);
bufptr += 46; /* "tree " + "hex sha1" + "\n" */
+ pptr = &item->parents;
while (!memcmp(bufptr, "parent ", 7) &&
!get_sha1_hex(bufptr + 7, parent)) {
struct commit *new_parent = lookup_commit(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);
}
bufptr += 48;