Merge branch 'maint'

diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 61a3378896708694ecaef3b4e593bf266c622c16..875e7ed99820998aa5d0e18f73b59763201cdb6c 100644 (file)
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -194,7 +194,7 @@ static int check_object(struct object *obj, int type, void *data, struct fsck_op
 
        if (!(obj->flags & FLAG_OPEN)) {
                unsigned long size;
-               int type = sha1_object_info(get_object_hash(*obj), &size);
+               int type = sha1_object_info(obj->oid.hash, &size);
                if (type != obj->type || type <= 0)
                        die("object of unexpected type");
                obj->flags |= FLAG_WRITTEN;