Merge branch 'bc/object-id'

diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 12cf4e471877f615f9f056ab42178e83d772a7ad..b6b291cf00e5cf0403b4168eca90d5f67bd65c0d 100644 (file)
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -130,13 +130,13 @@ struct ref_update {
        /*
         * If (flags & REF_HAVE_NEW), set the reference to this value:
         */
-       unsigned char new_sha1[20];
+       struct object_id new_oid;
 
        /*
         * If (flags & REF_HAVE_OLD), check that the reference
         * previously had this value:
         */
-       unsigned char old_sha1[20];
+       struct object_id old_oid;
 
        /*
         * One or more of REF_HAVE_NEW, REF_HAVE_OLD, REF_NODEREF,