From: Junio C Hamano <gitster@pobox.com>
To: Jon Simons <jon@jonsimons.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 08/12] remote: reject duplicate destinations on an empty remote
Date: Thu, 05 Nov 2026 14:32:34 -0800 [thread overview]
Message-ID: <xmqqqzgyq58d.fsf@gitster.g> (raw)
In-Reply-To: <20261014031347.50433-9-jon@jonsimons.org> (Jon Simons's message of "Tue, 13 Oct 2026 23:13:43 -0400")
Jon Simons <jon@jonsimons.org> writes:
> diff --git a/t/t5408-send-pack-stdin.sh b/t/t5408-send-pack-stdin.sh
> index 7af350f01c..1e34880323 100755
> --- a/t/t5408-send-pack-stdin.sh
> +++ b/t/t5408-send-pack-stdin.sh
> @@ -97,25 +97,25 @@ test_expect_success '--stdin refs are sent after cmdline refs' '
> verify_push A bar
> '
>
> -test_expect_success 'cmdline refs written in order' '
> +test_expect_success 'two cmdline refs for the same destination are rejected' '
> clear_remote &&
> test_must_fail git send-pack remote.git A:foo B:foo 2>err &&
> - test_grep "multiple updates for ref ${SQ}refs/heads/foo${SQ} not allowed" err &&
> + test_grep "dst ref refs/heads/foo receives from more than one src" err &&
> test_must_fail git --git-dir=remote.git rev-parse foo
> '
>
> -test_expect_success 'cmdline refs with multiple duplicates' '
> +test_expect_success 'three cmdline refs for the same destination are rejected' '
> clear_remote &&
> test_must_fail git send-pack remote.git A:foo B:foo C:foo 2>err &&
> - test_grep "multiple updates for ref ${SQ}refs/heads/foo${SQ} not allowed" err &&
> + test_grep "dst ref refs/heads/foo receives from more than one src" err &&
> test_must_fail git --git-dir=remote.git rev-parse foo
> '
>
> -test_expect_success '--stdin refs come after cmdline' '
> +test_expect_success 'cmdline and --stdin refs for the same destination are rejected' '
> clear_remote &&
> echo A:foo >input &&
> - test_must_fail git send-pack remote.git --stdin B:foo <input &&
> - test_grep "multiple updates for ref ${SQ}refs/heads/foo${SQ} not allowed" err &&
> + test_must_fail git send-pack remote.git --stdin B:foo <input 2>err &&
> + test_grep "dst ref refs/heads/foo receives from more than one src" err &&
> test_must_fail git --git-dir=remote.git rev-parse foo
> '
So these were already failing, and the only changes are the messaging?
Regardless, making sure that a push or a fetch that updates the same
thing in a potentially conflicting way fails is a very welcome
change.
next prev parent reply other threads:[~2026-11-05 22:32 UTC|newest]
Thread overview: 38+ 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 ` [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
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-11-05 23:03 ` Junio C Hamano
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-28 21:19 ` SZEDER Gábor
2026-11-05 22:26 ` Junio C Hamano
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-11-05 22:28 ` Junio C Hamano
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-11-05 22:32 ` Junio C Hamano [this message]
2026-10-14 3:13 ` [PATCH v2 09/12] remote: use strmap for match_explicit_refs() Jon Simons
2026-11-05 22:41 ` Junio C Hamano
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
2026-11-05 22:49 ` Junio C Hamano
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=xmqqqzgyq58d.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jon@jonsimons.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