All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Mike Crowe <mac@mcrowe.com>,
	"git@vger.kernel.org" <git@vger.kernel.org>,
	Jeff King <peff@peff.net>
Subject: Re: [PATCH 2/2] push: Use "last one wins" convention for --recurse-submodules
Date: Thu, 10 Dec 2015 15:44:14 -0800	[thread overview]
Message-ID: <CAGZ79kaehf+o9qwznTZyG743OrO2EerEO0PAWois4L2G6=933w@mail.gmail.com> (raw)
In-Reply-To: <xmqq8u51ho27.fsf@gitster.mtv.corp.google.com>

On Thu, Dec 10, 2015 at 3:38 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Stefan Beller <sbeller@google.com> writes:
>
>>> +               git push --recurse-submodules=on-demand --no-recurse-submodules ../pub.git master &&
>>> +               # Check that the submodule commit did not get there
>>
>> Do we want to check here that the supermodule commit did get there,
>> instead of only checking the submodule?
>
> Hmm, your point is that when the push succeeds, (1) the command
> should return with 0 status, (2) the branch in the superproject
> should update to the right commit, and (3) none of the submodule
> should be affected, and the current test does not check the second
> one?
>
> I think that makes sense, in somewhat a paranoid way ;-).

I was just comparing to the case before,
where we had

> +               # Check that the supermodule commit did get there
> +               git fetch ../pub.git &&
> +               git diff --quiet FETCH_HEAD master &&

which I just skimmed over and mistakenly thought it would be the same check as
before (checking the superproject did *not* get there).

So looking at it, the superprojects history would need no update,
the commit stays the same, so no need check for it to stay the same.

So, sorry for the noise.

  reply	other threads:[~2015-12-10 23:44 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-01 11:49 [PATCH v3] push: add recurseSubmodules config option Mike Crowe
2015-12-02  0:40 ` Jeff King
2015-12-02  9:54   ` Mike Crowe
2015-12-02  9:56     ` [PATCH] push: Improve --recurse-submodules support Mike Crowe
2015-12-02 23:21       ` Junio C Hamano
2015-12-03 13:10         ` Mike Crowe
2015-12-03 13:10           ` [PATCH 1/2] push: Fully test --recurse-submodules on command line overrides config Mike Crowe
2015-12-03 13:10             ` [PATCH 2/2] push: Use "last one wins" convention for --recurse-submodules Mike Crowe
2015-12-04 21:04               ` Junio C Hamano
2015-12-10 23:31               ` Stefan Beller
2015-12-10 23:38                 ` Junio C Hamano
2015-12-10 23:44                   ` Stefan Beller [this message]
2015-12-16 20:48             ` [PATCH 1/2] push: Fully test --recurse-submodules on command line overrides config Stefan Beller
2015-12-16 22:41               ` Junio C Hamano
2015-12-16 22:46                 ` Stefan Beller
2015-12-17 16:41                   ` 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='CAGZ79kaehf+o9qwznTZyG743OrO2EerEO0PAWois4L2G6=933w@mail.gmail.com' \
    --to=sbeller@google.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mac@mcrowe.com \
    --cc=peff@peff.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.