Merge branch 'mg/work-tree-tests' into maint

diff --git a/refs.c b/refs.c
index 0f7628db4d94c45cd26150f28d58903e26298e09..e2d34b253e4c9c4efcb30e88d11ccd3ce9e14deb 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -201,7 +201,7 @@ enum peel_status peel_object(const unsigned char *name, unsigned char *sha1)
        if (!o)
                return PEEL_INVALID;
 
-       hashcpy(sha1, o->sha1);
+       hashcpy(sha1, o->oid.hash);
        return PEEL_PEELED;
 }