Merge branch 'jh/fsck-promisors'

[thirdparty/git.git] / object.c

diff --git a/object.c b/object.c
index 0afdfd19b784a541ad6d7237add2fbb1c9ec91ab..9e6f9ff20b03f800edae8ec7adc26e30313a5616 100644 (file)
--- a/object.c
+++ b/object.c
@@ -252,7 +252,7 @@ struct object *parse_object(const struct object_id *oid)
        if (obj && obj->parsed)
                return obj;
 
-       if ((obj && obj->type == OBJ_BLOB) ||
+       if ((obj && obj->type == OBJ_BLOB && has_object_file(oid)) ||
            (!obj && has_object_file(oid) &&
             sha1_object_info(oid->hash, NULL) == OBJ_BLOB)) {
                if (check_sha1_signature(repl, NULL, 0, NULL) < 0) {