Merge branch 'sb/packfiles-in-repository' into next

diff --git a/refs.c b/refs.c
index cefbad20763ef346cb697c0b84f947f494f8a90a..10f69da2b859140e5d9bc61b395f737b2458dc6b 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -302,7 +302,7 @@ enum peel_status peel_object(const struct object_id *name, struct object_id *oid
        struct object *o = lookup_unknown_object(name->hash);
 
        if (o->type == OBJ_NONE) {
-               int type = sha1_object_info(name->hash, NULL);
+               int type = oid_object_info(name, NULL);
                if (type < 0 || !object_as_type(o, type, 0))
                        return PEEL_INVALID;
        }