X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=blob.c;h=c1fdd861c3dedbbd670fcf07989501fd0f9b5fda;hb=7612a1efdb0c0806b43db10ce784707aae874340;hp=280f5241577ac029e9d5a7eb5bf895642b342fc8;hpb=bd2c39f58f915af532b488c5bda753314f0db603;p=git.git

diff --git a/blob.c b/blob.c
index 280f5241..c1fdd861 100644
--- a/blob.c
+++ b/blob.c
@@ -1,19 +1,20 @@
-#include "blob.h"
 #include "cache.h"
+#include "blob.h"
 #include <stdlib.h>
 
 const char *blob_type = "blob";
 
-struct blob *lookup_blob(unsigned char *sha1)
+struct blob *lookup_blob(const unsigned char *sha1)
 {
 	struct object *obj = lookup_object(sha1);
 	if (!obj) {
-		struct blob *ret = xmalloc(sizeof(struct blob));
-		memset(ret, 0, sizeof(struct blob));
+		struct blob *ret = xcalloc(1, sizeof(struct blob));
 		created_object(sha1, &ret->object);
 		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);