From: Junio C Hamano <gitster@pobox.com>
To: Emily Shaffer <emilyshaffer@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] transport-helper: enforce atomic in push_refs_with_push
Date: Tue, 02 Jul 2019 14:37:42 -0700 [thread overview]
Message-ID: <xmqqa7dw2k49.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190702005340.66615-1-emilyshaffer@google.com> (Emily Shaffer's message of "Mon, 1 Jul 2019 17:53:40 -0700")
Emily Shaffer <emilyshaffer@google.com> writes:
> Teach transport-helper how to notice if skipping a ref during push would
> violate atomicity on the client side. We notice that a ref would be
> rejected, and choose not to send it, but don't notice that if the client
> has asked for --atomic we are violating atomicity if all the other
> pushes we are sending would succeed. Asking the server end to uphold
> atomicity wouldn't work here as the server doesn't have any idea that we
> tried to update a ref that's broken.
>
> The added test-case is a succinct way to reproduce this issue that fails
> today. The same steps work fine when we aren't using a transport-helper
> to get to the upstream, i.e. when we've added a local repository as a
> remote:
>
> git remote add ~/upstream upstream
>
> Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
> ---
> t/t5541-http-push-smart.sh | 58 ++++++++++++++++++++++++++++++++++++++
> transport-helper.c | 6 ++++
> transport.c | 15 +++++++++-
> 3 files changed, 78 insertions(+), 1 deletion(-)
>
> diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
> index 8ef8763e06..b57f6d480f 100755
> --- a/t/t5541-http-push-smart.sh
> +++ b/t/t5541-http-push-smart.sh
> @@ -177,6 +177,64 @@ test_expect_success 'push (chunked)' '
> test $HEAD = $(git rev-parse --verify HEAD))
> '
>
> +test_expect_success 'push --atomic also prevents branch creation' '
> + # Make up/master
> + d=$HTTPD_DOCUMENT_ROOT_PATH/atomic-branches.git &&
> + git init --bare "$d" &&
> + git --git-dir="$d" config http.receivepack true &&
> + up="$HTTPD_URL"/smart/atomic-branches.git &&
> + test_commit atomic1 &&
> + test_commit atomic2 &&
> + git push "$up" master &&
> + # Make master incompatible with up/master
> + git reset --hard HEAD^ &&
> + # Add a new branch
> + git branch atomic &&
> + # --atomic should roll back creation of up/atomic
> + test_must_fail git push --atomic "$up" master atomic &&
> + git ls-remote "$up" >up-remotes &&
> + test_must_fail grep atomic up-remotes
Don't use test_must_fail on non-git things. We are not in the
business of catching segfaulting system programs.
> +'
> +
> +test_expect_success 'push --atomic shows all failed refs' '
> + # Make up/master, up/allrefs
> + d=$HTTPD_DOCUMENT_ROOT_PATH/atomic-failed-refs.git &&
> + git init --bare "$d" &&
> + git --git-dir="$d" config http.receivepack true &&
> + up="$HTTPD_URL"/smart/atomic-failed-refs.git &&
> + test_commit allrefs1 &&
> + test_commit allrefs2 &&
> + git branch allrefs &&
> + git push "$up" master allrefs &&
> + # Make master and allrefs incompatible with up/master, up/allrefs
> + git checkout allrefs &&
> + git reset --hard HEAD^ &&
> + git checkout master &&
> + git reset --hard HEAD^ &&
> + # --atomic should complain about both master and allrefs
> + test_must_fail git push --atomic "$up" master allrefs >&output &&
Don't rely on ">&output", which is an unnecessary bash-ism here. It
breaks test run under shells like dash.
>output 2>&1
should be OK.
> + grep master output &&
> + grep allrefs output
> +'
> +
> +test_expect_success 'push --atomic indicates collateral failures' '
> + # Make up/master, up/collateral
> + d=$HTTPD_DOCUMENT_ROOT_PATH/atomic-collateral.git &&
> + git init --bare "$d" &&
> + git --git-dir="$d" config http.receivepack true &&
> + up="$HTTPD_URL"/smart/atomic-collateral.git &&
> + test_commit collateral1 &&
> + test_commit collateral2 &&
> + git branch collateral &&
> + git push "$up" master collateral &&
> + # Make master incompatible with up/master
> + git reset --hard HEAD^ &&
> + # --atomic should mention collateral was OK but failed anyway
> + test_must_fail git push --atomic "$up" master collateral >&output &&
Ditto.
> + grep "master -> master" output &&
> + grep "collateral -> collateral" output
> +'
> +
next prev parent reply other threads:[~2019-07-03 0:35 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 [this message]
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
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=xmqqa7dw2k49.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--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).