From: Junio C Hamano <gitster@pobox.com>
To: Emily Shaffer <emilyshaffer@google.com>
Cc: git@vger.kernel.org, Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v2] transport-helper: enforce atomic in push_refs_with_push
Date: Wed, 10 Jul 2019 10:44:22 -0700 [thread overview]
Message-ID: <xmqqpnmhu6mh.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190709211043.48597-1-emilyshaffer@google.com> (Emily Shaffer's message of "Tue, 9 Jul 2019 14:10:43 -0700")
Emily Shaffer <emilyshaffer@google.com> writes:
> +test_expect_success 'push --atomic also prevents branch creation, reports collateral' '
> + # Setup upstream repo - empty for now
> + d=$HTTPD_DOCUMENT_ROOT_PATH/atomic-branches.git &&
> + git init --bare "$d" &&
> + test_config -C "$d" http.receivepack true &&
> + up="$HTTPD_URL"/smart/atomic-branches.git &&
> +
> + # Tell up about two branches for now
-ECANTPARSE "Tell up" part.
> + test_commit atomic1 &&
> + test_commit atomic2 &&
> + git branch collateral &&
> + git push "$up" master collateral &&
OK, so an initially empty directory $d that appears to network
clients as $up now has two branches, 'master' and 'collateral',
both pointing at the same history that ends with two commits,
atomic2 whose parent is atomic1.
> + # collateral is a valid push, but should be failed by atomic push
> + git checkout collateral &&
> + test_commit collateral1 &&
> +
> + # Make master incompatible with upstream to provoke atomic
> + git checkout master &&
> + git reset --hard HEAD^ &&
collateral grows, master rewinds.
> + # Add a new branch which should be failed by atomic push. This is a
> + # regression case.
> + git branch atomic &&
Another branch atomic is added
> + # --atomic should cause entire push to be rejected
> + test_must_fail git push --atomic "$up" master atomic collateral 2>output &&
Attempt to push all three: collateral alone would be OK, so is
atomic, but because master rewinds, we expect none of the three to
go through.
> + # the new branch should not have been created upstream
> + test_must_fail git -C "$d" rev-parse refs/heads/atomic &&
The new branch should not have been created; if this rev-parse
succeeded, it would be a bug.
Up to point, I have no possible improvements to offer ;-)
Very well done.
> + # the failed refs should be indicated
> + grep "master -> master" output | grep rejected &&
I'd rather see the effect, i.e. what the command did that can be
observed externally, than the report, i.e. what the command claims
to have done, if it is equally straight-forward to verify either.
That can be done by making sure that the output from "git -C "$d"
rev-parse refs/heads/master" match output from "git rev-parse
atomic2", no? That ensures 'master' in the receiving end stayed the
same.
> + # the collateral failure refs should be indicated
> + grep "atomic -> atomic" output | grep "atomic push failed" &&
> + grep "collateral -> collateral" output | grep "atomic push failed"
Likewise for the other two.
FWIW, these three can further lose a process each, i.e.
grep "^ ! .*rejected.* master -> master" output
even if we for some reason do not want to check the effect and take
the claim by the command being tested at the face value (which I do
not think is a good idea).
Thanks.
next prev parent reply other threads:[~2019-07-10 17:44 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-02 0:53 [PATCH] transport-helper: enforce atomic in push_refs_with_push Emily Shaffer
2019-07-02 13:51 ` Johannes Schindelin
2019-07-02 18:27 ` Junio C Hamano
2019-07-03 18:56 ` Emily Shaffer
2019-07-03 19:01 ` Emily Shaffer
2019-07-03 19:41 ` Johannes Schindelin
2019-07-03 20:57 ` Emily Shaffer
2019-07-04 8:29 ` Johannes Schindelin
2019-07-09 20:23 ` Emily Shaffer
2019-07-02 19:06 ` Junio C Hamano
2019-07-02 20:16 ` Junio C Hamano
2019-07-03 0:09 ` Emily Shaffer
2019-07-02 21:37 ` Junio C Hamano
2019-07-03 0:08 ` Emily Shaffer
2019-07-03 9:10 ` SZEDER Gábor
2019-07-03 18:13 ` Junio C Hamano
2019-07-03 18:58 ` Emily Shaffer
2019-07-09 21:10 ` [PATCH v2] " Emily Shaffer
2019-07-10 17:44 ` Junio C Hamano [this message]
2019-07-10 17:53 ` Junio C Hamano
2019-07-11 21:14 ` Emily Shaffer
2019-07-11 20:57 ` Emily Shaffer
2019-07-11 21:13 ` Junio C Hamano
2019-07-11 21:19 ` [PATCH v3] " Emily Shaffer
2019-07-12 16:25 ` Junio C Hamano
2019-07-16 7:10 ` [PATCH v2] " Carlo Arenas
2019-07-16 16:53 ` Junio C Hamano
2019-07-16 17:21 ` [RFC/PATCH] CodingGuidelines: spell out post-C89 rules Junio C Hamano
2019-07-17 0:55 ` Jonathan Nieder
2019-07-17 16:03 ` Junio C Hamano
2019-07-19 1:15 ` Jonathan Nieder
2019-07-17 1:09 ` Bryan Turner
2019-07-17 16:05 ` Junio C Hamano
2019-07-16 18:00 ` [PATCH v2] transport-helper: enforce atomic in push_refs_with_push Carlo Arenas
2019-07-16 20:28 ` [PATCH] transport-helper: avoid var decl in for () loop control Junio C Hamano
2019-07-17 0:42 ` Jonathan Nieder
2019-07-18 15:22 ` [PATCH v2] transport-helper: enforce atomic in push_refs_with_push SZEDER Gábor
2019-07-18 16:12 ` Junio C Hamano
2019-07-18 23:46 ` SZEDER Gábor
2019-07-18 16:29 ` Eric Sunshine
2019-07-19 1:31 ` Jonathan Nieder
2019-07-19 4:49 ` Carlo Arenas
2019-07-19 19:15 ` Junio C Hamano
2019-07-27 8:43 ` SZEDER Gábor
2019-07-27 16:11 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqpnmhu6mh.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=emilyshaffer@google.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).