From: Jon Simons <jon@jonsimons.org>
To: git@vger.kernel.org
Cc: Jon Simons <jon@jonsimons.org>
Subject: [PATCH 08/15] t5408, t5410: test duplicate updates without relying on the client
Date: Fri, 9 Oct 2026 15:29:46 -0400 [thread overview]
Message-ID: <20261009192953.81794-9-jon@jonsimons.org> (raw)
In-Reply-To: <20261009192953.81794-1-jon@jonsimons.org>
The existing t5408 tests that use send-pack to transmit duplicate
updates for the same destination happen to rely on the client not
recognizing the duplicates when the remote is empty.
As a result, they are the only push tests that exercise each of:
- receive-pack rejection of multiple updates for the same ref, from
9d2962a7c4 (receive-pack: use batched reference updates, 2025-05-19)
- send-pack's receive_status() handling of a ref reported twice by the
remote, from 77188b5bba (send-pack: fix memory leak around duplicate
refs, 2025-05-19)
Add explicit tests for each of those paths, in preparation of an
upcoming commit that fixes the client to reject such pushes before
sending any update.
Signed-off-by: Jon Simons <jon@jonsimons.org>
---
t/t5408-send-pack-stdin.sh | 12 ++++++++++++
t/t5410-receive-pack.sh | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+)
diff --git a/t/t5408-send-pack-stdin.sh b/t/t5408-send-pack-stdin.sh
index ec339761c2..3c47be1af8 100755
--- a/t/t5408-send-pack-stdin.sh
+++ b/t/t5408-send-pack-stdin.sh
@@ -89,6 +89,18 @@ test_expect_success '--stdin refs come after cmdline' '
test_must_fail git --git-dir=remote.git rev-parse foo
'
+test_expect_success 'send-pack handles repeated status for the same ref' '
+ clear_remote &&
+ test_hook -C remote.git receive-report <<-\EOF &&
+ cat >/dev/null &&
+ printf "%s\n" "unpack ok" "ng refs/heads/foo first" \
+ "ng refs/heads/foo second" 0000 |
+ test-tool pkt-line pack
+ EOF
+ test_must_fail git send-pack remote.git A:foo 2>err &&
+ test_grep "remote rejected.*A -> foo (second)" err
+'
+
test_expect_success 'refspecs and --mirror do not mix (cmdline)' '
clear_remote &&
test_must_fail git send-pack remote.git --mirror $(cat refs)
diff --git a/t/t5410-receive-pack.sh b/t/t5410-receive-pack.sh
index 09d6bfd2a1..8fbc0c6bc9 100755
--- a/t/t5410-receive-pack.sh
+++ b/t/t5410-receive-pack.sh
@@ -97,4 +97,39 @@ test_expect_success TEE_DOES_NOT_HANG \
test_must_fail git -C remote.git rev-list $(git -C repo rev-parse HEAD)
'
+test_expect_success 'receive-pack rejects multiple updates for the same ref' '
+ test_when_finished "rm -rf repo remote.git" &&
+
+ git init repo &&
+ git -C repo commit --allow-empty -m A &&
+ git -C repo branch A &&
+ git -C repo commit --allow-empty -m B &&
+ git -C repo branch B &&
+ git init --bare remote.git &&
+ git -C repo send-pack ../remote.git A B &&
+ A=$(git -C repo rev-parse A) &&
+ B=$(git -C repo rev-parse B) &&
+ {
+ printf "%s %s refs/heads/foo\0report-status object-format=%s" \
+ $ZERO_OID $A "$(test_oid algo)" |
+ test-tool pkt-line pack-raw-stdin &&
+ printf "%s %s refs/heads/foo" $ZERO_OID $B |
+ test-tool pkt-line pack-raw-stdin &&
+ printf 0000 &&
+ git pack-objects --stdout </dev/null
+ } >request &&
+ git receive-pack remote.git <request >response 2>err &&
+ test_grep "multiple updates for ref ${SQ}refs/heads/foo${SQ} not allowed" err &&
+ test-tool pkt-line unpack <response >report &&
+ sed -n "/^unpack /,\$p" report >actual &&
+ cat >expect <<-\EOF &&
+ unpack ok
+ ng refs/heads/foo failed to update refs
+ ng refs/heads/foo failed to update refs
+ 0000
+ EOF
+ test_cmp expect actual &&
+ test_must_fail git --git-dir=remote.git rev-parse --verify refs/heads/foo
+'
+
test_done
--
2.55.0
next prev parent reply other threads:[~2026-10-09 19:37 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-09 19:29 [PATCH 00/15] push: speed up client-side refspec matching Jon Simons
2026-10-09 19:29 ` [PATCH 01/15] remote: validate --force-with-lease <refname> argument Jon Simons
2026-10-09 19:29 ` [PATCH 02/15] t5516: demonstrate push with "./"-prefixed source Jon Simons
2026-10-09 19:29 ` [PATCH 03/15] t5510: document fetch with "./"-prefixed branch.<name>.merge Jon Simons
2026-10-09 19:29 ` [PATCH 04/15] t/perf: add explicit delete refspec matching test Jon Simons
2026-10-09 19:29 ` [PATCH 05/15] refs: stop using mkpath() in refname_match() Jon Simons
2026-10-09 19:29 ` [PATCH 06/15] remote: use strmap for check_push_refs() Jon Simons
2026-10-09 19:29 ` [PATCH 07/15] t5516: test pushing two refspecs creating the same new branch Jon Simons
2026-10-09 19:29 ` Jon Simons [this message]
2026-10-09 19:29 ` [PATCH 09/15] t5408: check refspec order with distinct destinations Jon Simons
2026-10-09 19:29 ` [PATCH 10/15] t5408: expect client-side error for duplicate destinations Jon Simons
2026-10-09 19:29 ` [PATCH 11/15] remote: reject duplicate destinations on an empty remote Jon Simons
2026-10-09 19:29 ` [PATCH 12/15] remote: use strmap for match_explicit_refs() Jon Simons
2026-10-09 19:29 ` [PATCH 13/15] t/perf: measure --force-with-lease in p5516 Jon Simons
2026-10-09 19:29 ` [PATCH 14/15] remote: restructure apply_push_cas() loops Jon Simons
2026-10-09 19:29 ` [PATCH 15/15] remote: use strmap for apply_push_cas() Jon Simons
2026-10-09 20:18 ` [PATCH 00/15] push: speed up client-side refspec matching Kristoffer Haugsbakk
2026-10-11 2:35 ` Jon Simons
2026-10-14 3:13 ` [PATCH v2 00/12] " Jon Simons
2026-10-14 3:13 ` [PATCH v2 01/12] remote: validate --force-with-lease <refname> argument Jon Simons
2026-10-14 3:13 ` [PATCH v2 02/12] t/perf: add explicit delete refspec matching test Jon Simons
2026-10-14 3:13 ` [PATCH v2 03/12] refs: stop using mkpath() in refname_match() Jon Simons
2026-10-14 3:13 ` [PATCH v2 04/12] remote: use strmap for check_push_refs() Jon Simons
2026-10-14 3:13 ` [PATCH v2 05/12] send-pack: plug leak upon match_push_refs failure Jon Simons
2026-10-14 3:13 ` [PATCH v2 06/12] t5408, t5410: test duplicate updates without relying on the client Jon Simons
2026-10-14 3:13 ` [PATCH v2 07/12] t5408: check refspec order with distinct destinations Jon Simons
2026-10-14 3:13 ` [PATCH v2 08/12] remote: reject duplicate destinations on an empty remote Jon Simons
2026-10-14 3:13 ` [PATCH v2 09/12] remote: use strmap for match_explicit_refs() Jon Simons
2026-10-14 3:13 ` [PATCH v2 10/12] t/perf: measure --force-with-lease in p5516 Jon Simons
2026-10-14 3:13 ` [PATCH v2 11/12] remote: restructure apply_push_cas() loops Jon Simons
2026-10-14 3:13 ` [PATCH v2 12/12] remote: use strmap for apply_push_cas() Jon Simons
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261009192953.81794-9-jon@jonsimons.org \
--to=jon@jonsimons.org \
--cc=git@vger.kernel.org \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox