From 09b2aa30c916bd6facb47a06711755f043b6f37e Mon Sep 17 00:00:00 2001 From: Jeff King Date: Tue, 11 Aug 2020 02:53:47 -0400 Subject: 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 Reviewed-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- t/t1416-ref-transaction-hooks.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 't/t1416-ref-transaction-hooks.sh') diff --git a/t/t1416-ref-transaction-hooks.sh b/t/t1416-ref-transaction-hooks.sh index d4d19194bf..f6e741c6c0 100755 --- 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 -- cgit v1.2.3