On Wed, Mar 17, 2021 at 08:42:10PM -0700, Waleed Khan wrote: > The `reference-transaction` hook seems to have broken between Git > v2.30 and v2.31, or at least violated my expectations as a user. > > I didn't see any mention of the `reference-transaction` hook in the > release notes, so I assume that this is a bug. Given that there's > documentation at `man githooks` for the `reference-transaction` hook, > I assume that the feature is no longer in a preliminary stage, and so > a bug report is warranted. I couldn't find any mention of a > `reference-transaction` hook bug already having been reported in the > mailing list search online. Thanks for a clear explanation and reproduction recipe. I can see the bug easily here. It bisects to 8198907795 (use delete_refs when deleting tags or branches, 2021-01-20). I've cc'd the author of that commit, as well as the author of the ref-transaction hook (I've also retained the reproduction info for them at the end of the message). I _think_ this is probably another variant of what we were discussing in: https://lore.kernel.org/git/d255c7a5f95635c2e7ae36b9689c3efd07b4df5d.1604501894.git.ps@xxxxxx/ and that ended up with the documentation from: https://lore.kernel.org/git/55905b8693dd49637d0516ee123405cbfb58b6c6.1614591751.git.ps@xxxxxx/ Namely that the hook is not seeing the "old" ref value as it was on disk, but rather they see the value that the caller asked us to verify existed (or all zeroes if the caller didn't specify). So I think what happened is that git-branch went from calling "delete the ref X with value 1234abcd" to "delete the ref X, no matter what it's value is". -Peff -- >8 -- > To reproduce, run this script: > > ``` > #!/bin/sh > set -eu > > # Change between Git v2.30.0 and v2.31.0 here. > GIT=${GIT:-$(which git)} > echo "Running version $("$GIT" version)" > > # For determinism. > export GIT_COMMITTER_DATE="Wed Mar 17 16:53:32 PDT 2021" > export GIT_AUTHOR_DATE="Wed Mar 17 16:53:32 PDT 2021" > > rm -rf repo > mkdir repo > cd repo > "$GIT" init > "$GIT" commit --allow-empty -m 'Initial commit' > > mkdir .git/hooks > cat >.git/hooks/reference-transaction <<'EOF' > #!/bin/sh > echo "reference-transaction ($1):" > cat > EOF > chmod +x .git/hooks/reference-transaction > > "$GIT" branch -v 'test-branch' > echo "Created test-branch" > "$GIT" branch -v -d 'test-branch' > ``` > > ## Expected behavior (git v2.30) ## > > This is the output: > > ``` > [master (root-commit) 3b61ecc] Initial commit > reference-transaction (prepared): > 0000000000000000000000000000000000000000 > 3b61ecc56006fcc283d42b302191e1385f19b551 refs/heads/test-branch > reference-transaction (committed): > 0000000000000000000000000000000000000000 > 3b61ecc56006fcc283d42b302191e1385f19b551 refs/heads/test-branch > Created test-branch > reference-transaction (aborted): > 0000000000000000000000000000000000000000 > 0000000000000000000000000000000000000000 refs/heads/test-branch > reference-transaction (prepared): > 3b61ecc56006fcc283d42b302191e1385f19b551 > 0000000000000000000000000000000000000000 refs/heads/test-branch > reference-transaction (committed): > 3b61ecc56006fcc283d42b302191e1385f19b551 > 0000000000000000000000000000000000000000 refs/heads/test-branch > Deleted branch test-branch (was 3b61ecc). > ``` > > It's pretty strange that there was an "aborted" reference-transaction > from 0 to 0, especially with no previous "prepared" > reference-transaction, but that's not the bug in question, and I can > work around it by ignoring such transactions on my end. > > Notice that as part of the branch deletion, there is a > reference-transaction from a non-zero commit hash to a zero commit > hash. > > ## Actual behavior (git v2.31) ## > > ``` > [master (root-commit) 3b61ecc] Initial commit > reference-transaction (prepared): > 0000000000000000000000000000000000000000 > 3b61ecc56006fcc283d42b302191e1385f19b551 refs/heads/test-branch > reference-transaction (committed): > 0000000000000000000000000000000000000000 > 3b61ecc56006fcc283d42b302191e1385f19b551 refs/heads/test-branch > Created test-branch > reference-transaction (prepared): > 0000000000000000000000000000000000000000 > 0000000000000000000000000000000000000000 refs/heads/test-branch > reference-transaction (committed): > 0000000000000000000000000000000000000000 > 0000000000000000000000000000000000000000 refs/heads/test-branch > reference-transaction (aborted): > 0000000000000000000000000000000000000000 > 0000000000000000000000000000000000000000 refs/heads/test-branch > reference-transaction (prepared): > 0000000000000000000000000000000000000000 > 0000000000000000000000000000000000000000 refs/heads/test-branch > reference-transaction (committed): > 0000000000000000000000000000000000000000 > 0000000000000000000000000000000000000000 refs/heads/test-branch > Deleted branch test-branch (was 3b61ecc). > ``` > > My issues are 1) the reference-transaction deleting the branch goes > from a zero commit hash, instead of from the non-zero commit hash > 3b61ec, and 2) there's two such "committed" transactions for some > reason. Like the other example, there's also a mysterious unpaired > aborted transaction, but I assume that's not new behavior in this > release.
