Fix automerge message.

[git.git] / pull.c

diff --git a/pull.c b/pull.c
index cf3ec73..ff55044 100644 (file)
--- a/pull.c
+++ b/pull.c
@@ -127,6 +127,7 @@ static int process(unsigned char *sha1, const char *type)
 {
        struct object *obj = lookup_object_type(sha1, type);
        if (has_sha1_file(sha1)) {
+               parse_object(sha1);
                /* We already have it, so we should scan it now. */
                return process_object(obj);
        }
@@ -155,7 +156,7 @@ static int loop(void)
 
                //fprintf(stderr, "fetch %s\n", sha1_to_hex(obj->sha1));
                
-               if (make_sure_we_have_it(obj->type ?: "object", 
+               if (make_sure_we_have_it(obj->type ? obj->type : "object", 
                                         obj->sha1))
                        return -1;
                if (!obj->type)