Make default merge messages denser.

diff --git a/blob.c b/blob.c
index 35031af62bbcf61a59edf22f3502ec62e3bb2765..c800cd3905e2a4e97098064a588e15c0ae33a0b0 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -8,17 +8,45 @@ struct blob *lookup_blob(unsigned char *sha1)
 {
        struct object *obj = lookup_object(sha1);
        if (!obj) {
-               struct blob *ret = malloc(sizeof(struct blob));
+               struct blob *ret = xmalloc(sizeof(struct blob));
                memset(ret, 0, sizeof(struct blob));
                created_object(sha1, &ret->object);
                ret->object.type = blob_type;
-               ret->object.parsed = 1;
                return ret;
        }
-       if (obj->parsed && obj->type != blob_type) {
+       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);
                return NULL;
        }
        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;
+        buffer = read_sha1_file(item->object.sha1, type, &size);
+        if (!buffer)
+                return error("Could not read %s",
+                             sha1_to_hex(item->object.sha1));
+        if (strcmp(type, blob_type))
+                return error("Object %s not a blob",
+                             sha1_to_hex(item->object.sha1));
+       ret = parse_blob_buffer(item, buffer, size);
+       free(buffer);
+       return ret;
+}