X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=commit.c;h=9fbcbd33c7530275a31c701207a34c4bc462da05;hb=65f0d0ee4627dd0f0468ceded38677076d78feb5;hp=c0dd689ea3be3ef8d161cac056350e61851e7f64;hpb=d32987be618181db1f435a5c0a1bea85e90c7c7d;p=git.git

diff --git a/commit.c b/commit.c
index c0dd689e..9fbcbd33 100644
--- a/commit.c
+++ b/commit.c
@@ -15,7 +15,7 @@ struct commit *lookup_commit(unsigned char *sha1)
 		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;
@@ -59,13 +59,16 @@ int parse_commit(struct commit *item)
 			     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);