diff --git a/commit.c b/commit.c
index c0dd689ea3be3ef8d161cac056350e61851e7f64..9fbcbd33c7530275a31c701207a34c4bc462da05 100644 (file)
--- a/commit.c
+++ b/commit.c
ret->object.type = commit_type;
return ret;
}
- if (obj->parsed && obj->type != commit_type) {
+ if (obj->type != commit_type) {
error("Object %s is a %s, not a commit",
sha1_to_hex(sha1), obj->type);
return NULL;
sha1_to_hex(item->object.sha1));
get_sha1_hex(bufptr + 5, parent);
item->tree = lookup_tree(parent);
- add_ref(&item->object, &item->tree->object);
+ if (item->tree)
+ add_ref(&item->object, &item->tree->object);
bufptr += 46; /* "tree " + "hex sha1" + "\n" */
while (!memcmp(bufptr, "parent ", 7) &&
!get_sha1_hex(bufptr + 7, parent)) {
struct commit *new_parent = lookup_commit(parent);
- commit_list_insert(new_parent, &item->parents);
- add_ref(&item->object, &new_parent->object);
+ if (new_parent) {
+ commit_list_insert(new_parent, &item->parents);
+ add_ref(&item->object, &new_parent->object);
+ }
bufptr += 48;
}
item->date = parse_commit_date(bufptr);