On Tue, Aug 11, 2020 at 02:53:47AM -0400, Jeff King wrote: > On Mon, Aug 10, 2020 at 12:44:26PM -0700, Junio C Hamano wrote: > > > * ps/ref-transaction-hook (2020-08-07) 1 commit > > (merged to 'next' on 2020-08-10 at d8ad7cc8f6) > > + refs: fix interleaving hook calls with reference-transaction hook > > > > The logic to find the ref transaction hook script attempted to > > cache the path to the found hook without realizing that it needed > > to keep a copied value, as the API it used returned a transitory > > buffer space. This has been corrected. > > > > Will merge to 'master'. > > to be followed by a removal of the caching feature, which does not > > seem to help even as a negative cache. > > I noticed this had a CI problem. Fix is below. > > -- >8 -- > Subject: [PATCH] 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@xxxxxxxx> > --- > t/t1416-ref-transaction-hooks.sh | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > 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 > -- > 2.28.0.532.g36127779a4 Reviewed-by: Patrick Steinhardt <ps@xxxxxx> Thanks for cleaning up after me! Patrick
Attachment:
signature.asc
Description: PGP signature
