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

2016-08-23 Thread Junio C Hamano 
Stefan Beller  writes:

> On Wed, Aug 17, 2016 at 5:17 PM, Junio C Hamano  wrote:
>> Stefan Beller  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 ;-).

>
> 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);
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

2016-08-18 Thread Stefan Beller 
On Wed, Aug 17, 2016 at 5:17 PM, Junio C Hamano  wrote:
> Stefan Beller  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);
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

2016-08-17 Thread Junio C Hamano 
Stefan Beller  writes:

>  and now with error handling of invalid options. 

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html