mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'kn/ref-transaction-hook-with-reflog'

Browse Source 
The ref-transaction hook triggered for reflog updates, which has
been corrected.

* kn/ref-transaction-hook-with-reflog:
  refs: don't invoke reference-transaction hook for reflogs
This commit is contained in:
Junio C Hamano
2024-11-27 07:57:10 +09:00
parent 1f3d9b9814 b886db48c6
commit 4a611ee7eb
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
refs.c
View File

@ -2185,6 +2185,9 @@ static int run_transaction_hook(struct ref_transaction *transaction,
for (i = 0; i < transaction->nr; i++) { for (i = 0; i < transaction->nr; i++) {
struct ref_update *update = transaction->updates[i]; struct ref_update *update = transaction->updates[i];
if (update->flags & REF_LOG_ONLY)
continue;
strbuf_reset(&buf); strbuf_reset(&buf);
if (!(update->flags & REF_HAVE_OLD)) if (!(update->flags & REF_HAVE_OLD))

2
t/t1416-ref-transaction-hooks.sh
View File

@ -53,7 +53,6 @@ test_expect_success 'hook gets all queued updates in prepared state' '
fi fi
EOF EOF
cat >expect <<-EOF && cat >expect <<-EOF &&
$ZERO_OID $POST_OID HEAD
$ZERO_OID $POST_OID refs/heads/main $ZERO_OID $POST_OID refs/heads/main
EOF EOF
git update-ref HEAD POST <<-EOF && git update-ref HEAD POST <<-EOF &&
@ -76,7 +75,6 @@ test_expect_success 'hook gets all queued updates in committed state' '
fi fi
EOF EOF
cat >expect <<-EOF && cat >expect <<-EOF &&
$ZERO_OID $POST_OID HEAD
$ZERO_OID $POST_OID refs/heads/main $ZERO_OID $POST_OID refs/heads/main
EOF EOF
git update-ref HEAD POST && git update-ref HEAD POST &&