diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-11-27 07:57:10 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-11-27 07:57:10 +0900 |
| commit | 4a611ee7ebd2269b6f4711efd18adc811631af9f (patch) | |
| tree | f17d51524d26956ee9fbc3cd502b930b43221038 | |
| parent | 1f3d9b981465a8320878c725d2dd5924f452e786 (diff) | |
| parent | b886db48c61bdfb817f29482e18120c4fa2bc89c (diff) | |
| download | git-4a611ee7ebd2269b6f4711efd18adc811631af9f.tar.gz | |
Merge branch 'kn/ref-transaction-hook-with-reflog'
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
| -rw-r--r-- | refs.c | 3 | ||||
| -rwxr-xr-x | t/t1416-ref-transaction-hooks.sh | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -2185,6 +2185,9 @@ static int run_transaction_hook(struct ref_transaction *transaction, for (i = 0; i < transaction->nr; i++) { struct ref_update *update = transaction->updates[i]; + if (update->flags & REF_LOG_ONLY) + continue; + strbuf_reset(&buf); if (!(update->flags & REF_HAVE_OLD)) diff --git a/t/t1416-ref-transaction-hooks.sh b/t/t1416-ref-transaction-hooks.sh index 5a812ca3c0..262efec60e 100755 --- a/t/t1416-ref-transaction-hooks.sh +++ b/t/t1416-ref-transaction-hooks.sh @@ -53,7 +53,6 @@ test_expect_success 'hook gets all queued updates in prepared state' ' fi EOF cat >expect <<-EOF && - $ZERO_OID $POST_OID HEAD $ZERO_OID $POST_OID refs/heads/main EOF git update-ref HEAD POST <<-EOF && @@ -76,7 +75,6 @@ test_expect_success 'hook gets all queued updates in committed state' ' fi EOF cat >expect <<-EOF && - $ZERO_OID $POST_OID HEAD $ZERO_OID $POST_OID refs/heads/main EOF git update-ref HEAD POST && |