t1416: avoid hard-coded sha1 ids

The test added by e5256c82e5 (refs: fix interleaving hook calls with
reference-transaction hook, 2020-08-07) uses hard-coded sha1 object ids
in its expected output. This causes it to fail when run with
GIT_TEST_DEFAULT_HASH=sha256.

Let's make use of the oid variables we define earlier, as the rest of
the nearby tests do.

Signed-off-by: Jeff King <peff@peff.net>
Reviewed-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t1416-ref-transaction-hooks.sh b/t/t1416-ref-transaction-hooks.sh
index d4d19194bfb93683385d4b12c132cbe9d804acb8..f6e741c6c055a4e62fdbb16f50eedc7dcd4b383d 100755 (executable)
--- a/t/t1416-ref-transaction-hooks.sh
+++ b/t/t1416-ref-transaction-hooks.sh
@@ -7,6 +7,7 @@ test_description='reference transaction hooks'
 test_expect_success setup '
        mkdir -p .git/hooks &&
        test_commit PRE &&
+       PRE_OID=$(git rev-parse PRE) &&
        test_commit POST &&
        POST_OID=$(git rev-parse POST)
 '
@@ -120,10 +121,10 @@ test_expect_success 'interleaving hook calls succeed' '
        EOF
 
        cat >expect <<-EOF &&
-               hooks/update refs/tags/PRE 0000000000000000000000000000000000000000 63ac8e7bcdb882293465435909f54a96de17d4f7
+               hooks/update refs/tags/PRE $ZERO_OID $PRE_OID
                hooks/reference-transaction prepared
                hooks/reference-transaction committed
-               hooks/update refs/tags/POST 0000000000000000000000000000000000000000 99d53161c3a0a903b6561b9f6c0c665b3a476401
+               hooks/update refs/tags/POST $ZERO_OID $POST_OID
                hooks/reference-transaction prepared
                hooks/reference-transaction committed
        EOF