git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
	Jonathan Nieder <jrnieder@gmail.com>,
	Jens Lehmann <Jens.Lehmann@web.de>
Subject: Re: [PATCHv8 8/8] clone: recursive and reference option triggers submodule alternates
Date: Thu, 18 Aug 2016 10:18:08 -0700	[thread overview]
Message-ID: <CAGZ79kbRNG-BCs2vZAq5CWBNc2EYyaL7Ft-eTt2=H6GmP+aNfQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqziob6ibv.fsf@gitster.mtv.corp.google.com>

On Wed, Aug 17, 2016 at 5:17 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Stefan Beller <sbeller@google.com> writes:
>
>>  and now with error handling of invalid options.
>
> Thanks.

Well this was not the end of the story. I sent that version out,
before doing a final test run, because changing a few lines is trivial right? :(

I'll resend with:

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index a1da3ea..a366757 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -562,7 +562,7 @@ static void prepare_possible_alternates(const char *sm_name,

        if (!strcmp(sm_alternate, "superproject"))
                foreach_alt_odb(add_possible_reference_from_superproject, &sas);
-       else if (!strcmp(sm_alternate, "no")
+       else if (!strcmp(sm_alternate, "no"))
                ; /* do nothing */
        else
                die(_("Value '%s' for submodule.alternateLocation is
not recognized"), sm_alternate);

  reply	other threads:[~2016-08-19  2:41 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-17 22:45 [PATCHv8 8/8] clone: recursive and reference option triggers submodule alternates Stefan Beller
2016-08-18  0:17 ` Junio C Hamano
2016-08-18 17:18   ` Stefan Beller [this message]
2016-08-23 16:12     ` 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='CAGZ79kbRNG-BCs2vZAq5CWBNc2EYyaL7Ft-eTt2=H6GmP+aNfQ@mail.gmail.com' \
    --to=sbeller@google.com \
    --cc=Jens.Lehmann@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.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.
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).