X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=blob.c;h=ea52ad5c9d819721ff6f631d7d5b3057fabcd633;hb=6b17c674aa517c4b22cd88809fcf1532b8204fbf;hp=280f5241577ac029e9d5a7eb5bf895642b342fc8;hpb=bd2c39f58f915af532b488c5bda753314f0db603;p=git.git diff --git a/blob.c b/blob.c index 280f5241..ea52ad5c 100644 --- a/blob.c +++ b/blob.c @@ -4,7 +4,7 @@ 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) { @@ -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);