From: Patrick Steinhardt <ps@pks.im>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Bryan Turner <bturner@atlassian.com>,
Waleed Khan <me@waleedkhan.name>
Subject: Re: [PATCH v2 4/6] refs: demonstrate excessive execution of the reference-transaction hook
Date: Mon, 10 Jan 2022 13:54:03 +0100 [thread overview]
Message-ID: <Ydwsa0LiVfj+YP7N@ncase> (raw)
In-Reply-To: <xmqqiluv3tev.fsf@gitster.g>
[-- Attachment #1: Type: text/plain, Size: 3555 bytes --]
On Fri, Jan 07, 2022 at 05:31:04PM -0800, Junio C Hamano wrote:
> Patrick Steinhardt <ps@pks.im> writes:
>
> > Add tests which demonstate which demonstrates that we're executing the
>
> You demonstrate too often, which may be the point of the test, but
> looks wrong.
>
> I actually think this should be done as part of the fix to the code
> itself, which presumably is a single-liner to tell the "skip when
> running delete in packed-refs backend". IOW, just fix the code and
> test how the externally observable behaviour of the code should be
> in new tests, in the same commit.
The reason why I chose to split this out into a separate commit is that
it makes it easier to see what behaviour exactly is changing. If it was
a single step, then a reader would only see the post-image behaviour but
cannot reason about the pre-image behaviour without puzzling everything
together.
So personally I'd prefer to keep it as a separate step, but I'm not
opposed to merging them if you still disagree with my reasoning above.
Patrick
> > diff --git a/t/t1416-ref-transaction-hooks.sh b/t/t1416-ref-transaction-hooks.sh
> > index 6c941027a8..0567fbdf0b 100755
> > --- a/t/t1416-ref-transaction-hooks.sh
> > +++ b/t/t1416-ref-transaction-hooks.sh
> > @@ -136,4 +136,68 @@ test_expect_success 'interleaving hook calls succeed' '
> > test_cmp expect target-repo.git/actual
> > '
> >
> > +test_expect_success 'hook does not get called on packing refs' '
> > + # Pack references first such that we are in a known state.
> > + git pack-refs --all &&
> > +
> > + write_script .git/hooks/reference-transaction <<-\EOF &&
> > + echo "$@" >>actual
> > + cat >>actual
> > + EOF
> > + rm -f actual &&
> > +
> > + git update-ref refs/heads/unpacked-ref $POST_OID &&
> > + git pack-refs --all &&
> > +
> > + # We only expect a single hook invocation, which is the call to
> > + # git-update-ref(1). But currently, packing refs will also trigger the
> > + # hook.
> > + cat >expect <<-EOF &&
> > + prepared
> > + $ZERO_OID $POST_OID refs/heads/unpacked-ref
> > + committed
> > + $ZERO_OID $POST_OID refs/heads/unpacked-ref
> > + prepared
> > + $ZERO_OID $POST_OID refs/heads/unpacked-ref
> > + committed
> > + $ZERO_OID $POST_OID refs/heads/unpacked-ref
> > + prepared
> > + $POST_OID $ZERO_OID refs/heads/unpacked-ref
> > + committed
> > + $POST_OID $ZERO_OID refs/heads/unpacked-ref
> > + EOF
> > +
> > + test_cmp expect actual
> > +'
> > +
> > +test_expect_success 'deleting packed ref calls hook once' '
> > + # Create a reference and pack it.
> > + git update-ref refs/heads/to-be-deleted $POST_OID &&
> > + git pack-refs --all &&
> > +
> > + write_script .git/hooks/reference-transaction <<-\EOF &&
> > + echo "$@" >>actual
> > + cat >>actual
> > + EOF
> > + rm -f actual &&
> > +
> > + git update-ref -d refs/heads/to-be-deleted $POST_OID &&
> > +
> > + # We only expect a single hook invocation, which is the logical
> > + # deletion. But currently, we see two interleaving transactions, once
> > + # for deleting the loose refs and once for deleting the packed ref.
> > + cat >expect <<-EOF &&
> > + prepared
> > + $ZERO_OID $ZERO_OID refs/heads/to-be-deleted
> > + prepared
> > + $POST_OID $ZERO_OID refs/heads/to-be-deleted
> > + committed
> > + $ZERO_OID $ZERO_OID refs/heads/to-be-deleted
> > + committed
> > + $POST_OID $ZERO_OID refs/heads/to-be-deleted
> > + EOF
> > +
> > + test_cmp expect actual
> > +'
> > +
> > test_done
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2022-01-10 12:55 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-07 10:55 [PATCH 0/6] refs: excessive hook execution with packed refs Patrick Steinhardt
2021-12-07 10:55 ` [PATCH 1/6] refs: open-code deletion of " Patrick Steinhardt
2021-12-07 10:56 ` [PATCH 2/6] refs: allow passing flags when beginning transactions Patrick Steinhardt
2021-12-07 10:56 ` [PATCH 3/6] refs: allow skipping the reference-transaction hook Patrick Steinhardt
2021-12-07 10:56 ` [PATCH 4/6] refs: demonstrate excessive execution of " Patrick Steinhardt
2021-12-07 10:56 ` [PATCH 5/6] refs: do not execute reference-transaction hook on packing refs Patrick Steinhardt
2021-12-07 10:56 ` [PATCH 6/6] refs: skip hooks when deleting uncovered packed refs Patrick Steinhardt
2022-01-07 11:55 ` [PATCH v2 0/6] refs: excessive hook execution with " Patrick Steinhardt
2022-01-07 11:55 ` [PATCH v2 1/6] refs: open-code deletion of " Patrick Steinhardt
2022-01-08 0:57 ` Junio C Hamano
2022-01-08 1:51 ` Junio C Hamano
2022-01-13 0:24 ` Junio C Hamano
2022-01-07 11:55 ` [PATCH v2 2/6] refs: allow passing flags when beginning transactions Patrick Steinhardt
2022-01-08 1:51 ` Junio C Hamano
2022-01-07 11:55 ` [PATCH v2 3/6] refs: allow skipping the reference-transaction hook Patrick Steinhardt
2022-01-07 11:55 ` [PATCH v2 4/6] refs: demonstrate excessive execution of " Patrick Steinhardt
2022-01-08 1:31 ` Junio C Hamano
2022-01-10 12:54 ` Patrick Steinhardt [this message]
2022-01-08 5:43 ` Eric Sunshine
2022-01-07 11:55 ` [PATCH v2 5/6] refs: do not execute reference-transaction hook on packing refs Patrick Steinhardt
2022-01-07 11:55 ` [PATCH v2 6/6] refs: skip hooks when deleting uncovered packed refs Patrick Steinhardt
2022-01-08 2:01 ` Junio C Hamano
2022-01-10 13:18 ` Patrick Steinhardt
2022-01-10 18:00 ` Junio C Hamano
2022-01-07 22:17 ` [PATCH v2 0/6] refs: excessive hook execution with " Junio C Hamano
2022-01-13 18:24 ` Han-Wen Nienhuys
2022-01-17 7:18 ` Patrick Steinhardt
2022-01-17 11:37 ` Han-Wen Nienhuys
2022-01-24 7:13 ` Patrick Steinhardt
2022-01-13 6:11 ` [PATCH v3 " Patrick Steinhardt
2022-01-13 6:11 ` [PATCH v3 1/6] refs: extract packed_refs_delete_refs() to allow control of transaction Patrick Steinhardt
2022-01-13 12:43 ` Ævar Arnfjörð Bjarmason
2022-01-17 7:36 ` Patrick Steinhardt
2022-01-13 6:11 ` [PATCH v3 2/6] refs: allow passing flags when beginning transactions Patrick Steinhardt
2022-01-13 6:11 ` [PATCH v3 3/6] refs: allow skipping the reference-transaction hook Patrick Steinhardt
2022-01-13 13:34 ` Ævar Arnfjörð Bjarmason
2022-01-17 8:03 ` Patrick Steinhardt
2022-01-13 6:11 ` [PATCH v3 4/6] refs: demonstrate excessive execution of " Patrick Steinhardt
2022-01-13 6:11 ` [PATCH v3 5/6] refs: do not execute reference-transaction hook on packing refs Patrick Steinhardt
2022-01-13 13:00 ` Ævar Arnfjörð Bjarmason
2022-01-17 7:44 ` Patrick Steinhardt
2022-01-13 6:11 ` [PATCH v3 6/6] refs: skip hooks when deleting uncovered packed refs Patrick Steinhardt
2022-01-13 13:04 ` Ævar Arnfjörð Bjarmason
2022-01-17 7:56 ` Patrick Steinhardt
2022-01-17 8:12 ` [PATCH v4 0/6] refs: excessive hook execution with " Patrick Steinhardt
2022-01-17 8:12 ` [PATCH v4 1/6] refs: extract packed_refs_delete_refs() to allow control of transaction Patrick Steinhardt
2022-01-17 8:12 ` [PATCH v4 2/6] refs: allow passing flags when beginning transactions Patrick Steinhardt
2022-01-17 8:12 ` [PATCH v4 3/6] refs: allow skipping the reference-transaction hook Patrick Steinhardt
2022-01-17 8:12 ` [PATCH v4 4/6] refs: demonstrate excessive execution of " Patrick Steinhardt
2022-01-17 8:12 ` [PATCH v4 5/6] refs: do not execute reference-transaction hook on packing refs Patrick Steinhardt
2022-01-17 8:12 ` [PATCH v4 6/6] refs: skip hooks when deleting uncovered packed refs Patrick Steinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Ydwsa0LiVfj+YP7N@ncase \
--to=ps@pks.im \
--cc=bturner@atlassian.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@waleedkhan.name \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).