From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Romuald Brunet <romuald@chivil.com>,
Git Mailing List <git@vger.kernel.org>, Jeff King <peff@peff.net>,
Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: Re: [PATCH] push: allow atomic flag via configuration
Date: Mon, 27 Mar 2017 09:59:31 -0700 [thread overview]
Message-ID: <xmqq7f3a3bbg.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CACBZZX7HAg89htqPgkFd+ks-E7fcgAWfQ9n9qRj-YM88tj3t-A@mail.gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Mon, 27 Mar 2017 11:33:05 +0200")
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> On Fri, Mar 24, 2017 at 6:17 PM, Romuald Brunet <romuald@chivil.com> wrote:
>> +test_expect_success 'atomic option possible via git-config' '
>> + # prepare the repo
>> + mk_repo_pair &&
>> + (
>> + cd workbench &&
>> + test_commit one &&
>> + git checkout -b second master &&
>> + test_commit two &&
>> + git push --mirror up
>> + ) &&
>> + # a third party modifies the server side:
>> + (
>> + cd upstream &&
>> + git checkout second &&
>> + git tag test_tag second
>> + ) &&
>> + # see if we can now push both branches.
>> + (
>> + cd workbench &&
>> + git config push.atomic true &&
>> + git checkout master &&
>> + test_commit three &&
>> + git checkout second &&
>> + test_commit four &&
>> + git tag test_tag &&
>> + test_must_fail git push --tags up master second
>> + ) &&
>> + test_refs master HEAD@{3} &&
>> + test_refs second HEAD@{1}
>> +'
>> +
>
> Sent my earlier E-Mail too soon, so I missed this, there's no test
> here for what "git config push.atomic false" && "git push --atomic"
> does, is that atomic or not? I.e. what does "git -c push.atomic=false
> push --atomic" do? Does the CLI option override the config as it
> should?
Good points. Thanks for reading and reviewing the tests carefully.
prev parent reply other threads:[~2017-03-27 17:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-24 17:17 [PATCH] push: allow atomic flag via configuration Romuald Brunet
2017-03-24 18:45 ` Jeff King
2017-03-24 18:53 ` Jonathan Nieder
2017-03-24 19:01 ` Jeff King
2017-03-24 19:29 ` Junio C Hamano
2017-03-27 8:27 ` Romuald Brunet
2017-03-28 0:51 ` Jonathan Nieder
2017-03-27 9:30 ` Ævar Arnfjörð Bjarmason
2017-03-27 9:33 ` Ævar Arnfjörð Bjarmason
2017-03-27 16:59 ` Junio C Hamano [this message]
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=xmqq7f3a3bbg.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Matthieu.Moy@imag.fr \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=romuald@chivil.com \
/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).