Re: [PATCH v2 13/13] submodule--helper update-clone: check for --filter and --init
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Mar 3, 2022, 10:06 UTC
- Message-ID
- <220303.86o82n5oyp.gmgdl@evledraar.gmail.com>
- In-Reply-To
- <kl6llexted2t.fsf@chooglen-macbookpro.roam.corp.google.com>
On Tue, Mar 01 2022, Glen Choo wrote:
Show 35 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>>
>>>> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
>>>> index 2ffc070319..3e8a05a052 100644
>>>> --- a/builtin/submodule--helper.c
>>>> +++ b/builtin/submodule--helper.c
>>>> @@ -2543,7 +2543,12 @@ static int update_clone(int argc, const char **argv, const char *prefix)
>>>> };
>>>>
>>>> const char *const git_submodule_helper_usage[] = {
>>>> - N_("git submodule--helper update-clone [--prefix=<path>] [<path>...]"),
>>>> + N_("git submodule [--quiet] update"
>>>> + "[--init [--filter=<filter-spec>]] [--remote]"
>>>> + "[-N|--no-fetch] [-f|--force]"
>>>> + "[--checkout|--merge|--rebase]"
>>>> + "[--[no-]recommend-shallow] [--reference <repository>]"
>>>> + "[--recursive] [--[no-]single-branch] [--] [<path>...]"),
>>>
>>> Since this has <repository>, <path> etc. it should still be marked for
>>> translation with N_().
>>
>> Yeah, that sounds like a good idea. Isn't it already inside N_()?
>
> Did I do this correctly? e.g. an alternative interpretation is that Ævar
> misread this as:
>
> const char *const git_submodule_helper_usage[] = {
> N_("git submodule [--quiet] update"),
> "[--init [--filter=<filter-spec>]] [--remote]",
> "[-N|--no-fetch] [-f|--force]",
> "[--checkout|--merge|--rebase]",
> "[--[no-]recommend-shallow] [--reference <repository>]",
> "[--recursive] [--[no-]single-branch] [--] [<path>...]",(Even if a v3 has already been sent out). Yes, sorry. I just misread this. The pre-image is correct.