From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Justin Tobler via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Patrick Steinhardt <ps@pks.im>,
Justin Tobler <jltobler@gmail.com>
Subject: Re: [PATCH v2 2/2] t5541: remove lockfile creation
Date: Fri, 12 Jan 2024 09:58:08 -0800 [thread overview]
Message-ID: <xmqqo7dqbfin.fsf@gitster.g> (raw)
In-Reply-To: <20240112070356.GE618729@coredump.intra.peff.net> (Jeff King's message of "Fri, 12 Jan 2024 02:03:56 -0500")
Jeff King <peff@peff.net> writes:
> On Thu, Jan 11, 2024 at 08:24:30PM +0000, Justin Tobler via GitGitGadget wrote:
>
>> - # the new branch should not have been created upstream
>> - test_must_fail git -C "$d" show-ref --verify refs/heads/atomic &&
>> -
>> - # upstream should still reflect atomic2, the last thing we pushed
>> - # successfully
>> - git rev-parse atomic2 >expected &&
>> - # ...to other.
>> - git -C "$d" rev-parse refs/heads/other >actual &&
>> - test_cmp expected actual &&
>> -
>> - # the new branch should not have been created upstream
>> + # The atomic and other branches should be created upstream.
>> test_must_fail git -C "$d" show-ref --verify refs/heads/atomic &&
>> + test_must_fail git -C "$d" show-ref --verify refs/heads/other &&
>
> This last comment should say "should not be created", I think?
>
> Other than that, both patches look good to me.
Thanks. Will queue with the following and "Acked-by: peff".
diff --git c/t/t5541-http-push-smart.sh w/t/t5541-http-push-smart.sh
index 9a8bed6c32..71428f3d5c 100755
--- c/t/t5541-http-push-smart.sh
+++ w/t/t5541-http-push-smart.sh
@@ -242,7 +242,7 @@ test_expect_success 'push --atomic fails on server-side errors' '
# --atomic should cause entire push to be rejected
test_must_fail git push --atomic "$up" atomic other 2>output &&
- # The atomic and other branches should be created upstream.
+ # The atomic and other branches should not be created upstream.
test_must_fail git -C "$d" show-ref --verify refs/heads/atomic &&
test_must_fail git -C "$d" show-ref --verify refs/heads/other &&
next prev parent reply other threads:[~2024-01-12 17:58 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-10 18:52 [PATCH 0/2] Generalize reference locking in tests Justin Tobler via GitGitGadget
2024-01-10 18:52 ` [PATCH 1/2] t1401: generalize reference locking Justin Tobler via GitGitGadget
2024-01-11 7:13 ` Jeff King
2024-01-11 11:08 ` Patrick Steinhardt
2024-01-12 7:01 ` Jeff King
2024-01-12 7:45 ` Patrick Steinhardt
2024-01-12 8:03 ` Jeff King
2024-01-11 20:19 ` Justin Tobler
2024-01-10 18:52 ` [PATCH 2/2] t5541: " Justin Tobler via GitGitGadget
2024-01-11 7:28 ` Jeff King
2024-01-11 18:47 ` Junio C Hamano
2024-01-11 20:20 ` Justin Tobler
2024-01-11 0:36 ` [PATCH 0/2] Generalize reference locking in tests Junio C Hamano
2024-01-11 20:20 ` Justin Tobler
2024-01-11 20:24 ` [PATCH v2 " Justin Tobler via GitGitGadget
2024-01-11 20:24 ` [PATCH v2 1/2] t1401: remove lockfile creation Justin Tobler via GitGitGadget
2024-01-11 20:24 ` [PATCH v2 2/2] t5541: " Justin Tobler via GitGitGadget
2024-01-12 7:03 ` Jeff King
2024-01-12 17:58 ` Junio C Hamano [this message]
2024-01-13 22:25 ` Justin Tobler
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=xmqqo7dqbfin.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=jltobler@gmail.com \
--cc=peff@peff.net \
--cc=ps@pks.im \
/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;
as well as URLs for NNTP newsgroup(s).