Re: [PATCHv8 8/8] clone: recursive and reference option triggers submodule alternates

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 23, 2016, 16:12 UTC
Message-ID: <xmqqfupvxy4b.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CAGZ79kbRNG-BCs2vZAq5CWBNc2EYyaL7Ft-eTt2=H6GmP+aNfQ@mail.gmail.com>

Stefan Beller <sbeller@google.com> writes:

Show 11 quoted lines

> 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:

Heh, my integration test caught it before pushing it out ;-).

Show 15 quoted lines

>
> 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);