pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches

diff --git a/blob.c b/blob.c
index 625db43971182e14eacc64f6514c16dd45644c86..ae320bd8fa22aaaef8144bd6bc35c20d1e85e4f4 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -1,42 +1,25 @@
-#include "blob.h"
 #include "cache.h"
-#include <stdlib.h>
+#include "blob.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));
-               created_object(sha1, &ret->object);
-               ret->object.type = blob_type;
-               return ret;
-       }
-       if (obj->type != blob_type) {
-               error("Object %s is a %s, not a blob", 
-                     sha1_to_hex(sha1), obj->type);
+       if (!obj)
+               return create_object(sha1, OBJ_BLOB, alloc_blob_node());
+       if (!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;
 }
 
-int parse_blob(struct blob *item)
+int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size)
 {
-        char type[20];
-        void *buffer;
-        unsigned long size;
-        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));
+       item->object.parsed = 1;
        return 0;
 }