X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=blob.c;h=c800cd3905e2a4e97098064a588e15c0ae33a0b0;hb=000182eacf99cde27d5916aa415921924b82972c;hp=625db43971182e14eacc64f6514c16dd45644c86;hpb=d0d0d0bd3c2c4591ffbc292d7e082e8ad8f2057f;p=git.git

diff --git a/blob.c b/blob.c
index 625db439..c800cd39 100644
--- a/blob.c
+++ b/blob.c
@@ -14,6 +14,8 @@ struct blob *lookup_blob(unsigned char *sha1)
 		ret->object.type = blob_type;
 		return ret;
 	}
+	if (!obj->type)
+		obj->type = blob_type;
 	if (obj->type != blob_type) {
 		error("Object %s is a %s, not a blob", 
 		      sha1_to_hex(sha1), obj->type);
@@ -22,21 +24,29 @@ struct blob *lookup_blob(unsigned char *sha1)
 	return (struct blob *) obj;
 }
 
+int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size)
+{
+	item->object.parsed = 1;
+	return 0;
+}
+
 int parse_blob(struct blob *item)
 {
         char type[20];
         void *buffer;
         unsigned long size;
+	int ret;
+
         if (item->object.parsed)
                 return 0;
-        item->object.parsed = 1;
         buffer = read_sha1_file(item->object.sha1, type, &size);
         if (!buffer)
                 return error("Could not read %s",
                              sha1_to_hex(item->object.sha1));
-	free(buffer);
         if (strcmp(type, blob_type))
                 return error("Object %s not a blob",
                              sha1_to_hex(item->object.sha1));
-	return 0;
+	ret = parse_blob_buffer(item, buffer, size);
+	free(buffer);
+	return ret;
 }