From: Jon Simons <jon@jonsimons.org>
To: git@vger.kernel.org
Cc: Jon Simons <jon@jonsimons.org>
Subject: [PATCH 07/15] t5516: test pushing two refspecs creating the same new branch
Date: Fri, 9 Oct 2026 15:29:45 -0400 [thread overview]
Message-ID: <20261009192953.81794-8-jon@jonsimons.org> (raw)
In-Reply-To: <20261009192953.81794-1-jon@jonsimons.org>
Pushing two refspecs that create the same new branch fails client-side
as desired with "dst ref <dst> receives from more than one src", as long
as the remote advertises at least one ref.
But pushing the same to an empty remote does not fail client-side as
expected: a --dry-run push prints "[new branch]" twice, and an actual
push fails on the server side with "multiple updates for ref '<dst>'
not allowed".
Add tests for both remotes, with and without --dry-run. The empty repo
passes are marked as test_expect_failure, in preparation for a commit
that includes a fix and toggles them to test_expect_success.
Signed-off-by: Jon Simons <jon@jonsimons.org>
---
t/t5516-fetch-push.sh | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 81ad6cd52f..e150246577 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -400,6 +400,42 @@ test_expect_success 'push with no ambiguity (2)' '
check_push_result testrepo $the_commit remotes/origin/main
'
+test_expect_success 'push --dry-run two refspecs targeting the same ref fails' '
+ mk_test testrepo heads/main &&
+ test_must_fail git push --dry-run testrepo main:frotz main:frotz 2>err &&
+ test_grep "dst ref refs/heads/frotz receives from more than one src" err
+'
+
+test_expect_success 'push two refspecs targeting the same ref fails' '
+ mk_test testrepo heads/main &&
+ test_must_fail git push testrepo main:frotz main:frotz 2>err &&
+ test_grep "dst ref refs/heads/frotz receives from more than one src" err
+'
+
+test_expect_failure 'push --dry-run two refspecs creating the same ref fails on empty repo' '
+ mk_empty testrepo &&
+ test_must_fail git push --dry-run testrepo main:frotz main:frotz 2>err &&
+ test_grep "dst ref refs/heads/frotz receives from more than one src" err
+'
+
+test_expect_failure 'push two refspecs creating the same ref fails on empty repo' '
+ mk_empty testrepo &&
+ test_must_fail git push testrepo main:frotz main:frotz 2>err &&
+ test_grep "dst ref refs/heads/frotz receives from more than one src" err
+'
+
+test_expect_failure 'push --dry-run abbreviated then full refspec creating the same ref fails on empty repo' '
+ mk_empty testrepo &&
+ test_must_fail git push --dry-run testrepo main:frotz main:refs/heads/frotz 2>err &&
+ test_grep "dst ref refs/heads/frotz receives from more than one src" err
+'
+
+test_expect_failure 'push abbreviated then full refspec creating the same ref fails on empty repo' '
+ mk_empty testrepo &&
+ test_must_fail git push testrepo main:frotz main:refs/heads/frotz 2>err &&
+ test_grep "dst ref refs/heads/frotz receives from more than one src" err
+'
+
test_expect_success 'push with colon-less refspec, no ambiguity' '
mk_test testrepo heads/main heads/t/main &&
git branch -f t/main main &&
--
2.55.0
next prev parent reply other threads:[~2026-10-09 19:30 UTC|newest]
Thread overview: 18+ 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 ` Jon Simons [this message]
2026-10-09 19:29 ` [PATCH 08/15] t5408, t5410: test duplicate updates without relying on the client Jon Simons
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
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-8-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