Teach 'git apply' to look at $GIT_DIR/config

diff --git a/blob.c b/blob.c
index ea52ad5c9d819721ff6f631d7d5b3057fabcd633..9776beac5827a4c705eddde426817dcc40c525bc 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -1,6 +1,5 @@
-#include "blob.h"
 #include "cache.h"
-#include <stdlib.h>
+#include "blob.h"
 
 const char *blob_type = "blob";
 
@@ -8,17 +7,16 @@ 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 = alloc_blob_node();
                created_object(sha1, &ret->object);
-               ret->object.type = blob_type;
+               ret->object.type = OBJ_BLOB;
                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);
+               obj->type = OBJ_BLOB;
+       if (obj->type != OBJ_BLOB) {
+               error("Object %s is a %s, not a blob",
+                     sha1_to_hex(sha1), typename(obj->type));
                return NULL;
        }
        return (struct blob *) obj;