combine-diff: extend --cc logic to Octopus.

diff --git a/blob.c b/blob.c
index 280f5241577ac029e9d5a7eb5bf895642b342fc8..84ec1212e7010b8cbf535355d4114eded3007672 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -1,10 +1,10 @@
-#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) {
@@ -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);