From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Glen Choo <chooglen@google.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH v2 13/13] submodule--helper update-clone: check for --filter and --init
Date: Thu, 03 Mar 2022 11:06:58 +0100 [thread overview]
Message-ID: <220303.86o82n5oyp.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <kl6llexted2t.fsf@chooglen-macbookpro.roam.corp.google.com>
On Tue, Mar 01 2022, Glen Choo wrote:
> 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.
next prev parent reply other threads:[~2022-03-03 10:07 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-01 0:08 [PATCH 00/13] submodule: convert parts of 'update' to C Glen Choo
2022-03-01 0:08 ` [PATCH 01/13] submodule tests: test for init and update failure output Glen Choo
2022-03-01 0:08 ` [PATCH 02/13] submodule--helper: remove update-module-mode Glen Choo
2022-03-01 0:08 ` [PATCH 03/13] submodule--helper: reorganize code for sh to C conversion Glen Choo
2022-03-01 0:08 ` [PATCH 04/13] submodule--helper run-update-procedure: remove --suboid Glen Choo
2022-03-01 0:08 ` [PATCH 05/13] submodule--helper: remove ensure-core-worktree Glen Choo
2022-03-01 0:08 ` [PATCH 06/13] submodule--helper: get remote names from any repository Glen Choo
2022-03-01 2:46 ` Junio C Hamano
2022-03-01 4:26 ` Glen Choo
2022-03-01 0:08 ` [PATCH 07/13] submodule--helper: don't use bitfield indirection for parse_options() Glen Choo
2022-03-01 0:08 ` [PATCH 08/13] submodule--helper run-update-procedure: learn --remote Glen Choo
2022-03-01 0:08 ` [PATCH 09/13] submodule--helper: refactor get_submodule_displaypath() Glen Choo
2022-03-01 0:08 ` [PATCH 10/13] submodule--helper: allow setting superprefix for init_submodule() Glen Choo
2022-03-01 0:08 ` [PATCH 11/13] submodule--helper update-clone: learn --init Glen Choo
2022-03-01 0:08 ` [PATCH 12/13] submodule update: add tests for --filter Glen Choo
2022-03-01 0:08 ` [PATCH 13/13] submodule--helper update-clone: check for --filter and --init Glen Choo
2022-03-01 1:29 ` [PATCH 00/13] submodule: convert parts of 'update' to C Glen Choo
2022-03-01 4:41 ` [PATCH v2 " Glen Choo
2022-03-01 4:41 ` [PATCH v2 01/13] submodule tests: test for init and update failure output Glen Choo
2022-03-01 4:41 ` [PATCH v2 02/13] submodule--helper: remove update-module-mode Glen Choo
2022-03-01 4:41 ` [PATCH v2 03/13] submodule--helper: reorganize code for sh to C conversion Glen Choo
2022-03-01 4:41 ` [PATCH v2 04/13] submodule--helper run-update-procedure: remove --suboid Glen Choo
2022-03-01 4:41 ` [PATCH v2 05/13] submodule--helper: remove ensure-core-worktree Glen Choo
2022-03-01 4:41 ` [PATCH v2 06/13] submodule--helper: get remote names from any repository Glen Choo
2022-03-01 8:01 ` Ævar Arnfjörð Bjarmason
2022-03-01 4:41 ` [PATCH v2 07/13] submodule--helper: don't use bitfield indirection for parse_options() Glen Choo
2022-03-01 4:41 ` [PATCH v2 08/13] submodule--helper run-update-procedure: learn --remote Glen Choo
2022-03-01 4:41 ` [PATCH v2 09/13] submodule--helper: refactor get_submodule_displaypath() Glen Choo
2022-03-01 8:05 ` Ævar Arnfjörð Bjarmason
2022-03-01 4:41 ` [PATCH v2 10/13] submodule--helper: allow setting superprefix for init_submodule() Glen Choo
2022-03-01 4:41 ` [PATCH v2 11/13] submodule--helper update-clone: learn --init Glen Choo
2022-03-01 4:41 ` [PATCH v2 12/13] submodule update: add tests for --filter Glen Choo
2022-03-01 8:07 ` Ævar Arnfjörð Bjarmason
2022-03-01 18:30 ` Glen Choo
2022-03-01 4:41 ` [PATCH v2 13/13] submodule--helper update-clone: check for --filter and --init Glen Choo
2022-03-01 7:21 ` Ævar Arnfjörð Bjarmason
2022-03-01 7:34 ` Junio C Hamano
2022-03-01 18:34 ` Glen Choo
2022-03-03 10:06 ` Ævar Arnfjörð Bjarmason [this message]
2022-03-03 0:57 ` [PATCH v3 00/13] submodule: convert parts of 'update' to C Glen Choo
2022-03-03 0:57 ` [PATCH v3 01/13] submodule tests: test for init and update failure output Glen Choo
2022-03-03 0:57 ` [PATCH v3 02/13] submodule--helper: remove update-module-mode Glen Choo
2022-03-03 0:57 ` [PATCH v3 03/13] submodule--helper: reorganize code for sh to C conversion Glen Choo
2022-03-03 0:57 ` [PATCH v3 04/13] submodule--helper run-update-procedure: remove --suboid Glen Choo
2022-03-03 21:09 ` Junio C Hamano
2022-03-03 0:57 ` [PATCH v3 05/13] submodule--helper: remove ensure-core-worktree Glen Choo
2022-03-03 21:25 ` Junio C Hamano
2022-03-04 21:27 ` Glen Choo
2022-03-03 0:57 ` [PATCH v3 06/13] submodule--helper: get remote names from any repository Glen Choo
2022-03-03 0:57 ` [PATCH v3 07/13] submodule--helper: don't use bitfield indirection for parse_options() Glen Choo
2022-03-03 0:57 ` [PATCH v3 08/13] submodule--helper run-update-procedure: learn --remote Glen Choo
2022-03-03 21:35 ` Junio C Hamano
2022-03-04 21:29 ` Glen Choo
2022-03-03 0:57 ` [PATCH v3 09/13] submodule--helper: refactor get_submodule_displaypath() Glen Choo
2022-03-03 0:57 ` [PATCH v3 10/13] submodule--helper: allow setting superprefix for init_submodule() Glen Choo
2022-03-03 0:57 ` [PATCH v3 11/13] submodule--helper update-clone: learn --init Glen Choo
2022-03-03 0:57 ` [PATCH v3 12/13] submodule update: add tests for --filter Glen Choo
2022-03-03 0:57 ` [PATCH v3 13/13] submodule--helper update-clone: check for --filter and --init Glen Choo
2022-03-03 9:58 ` [PATCH v3 00/13] submodule: convert parts of 'update' to C Ævar Arnfjörð Bjarmason
2022-03-03 21:41 ` Junio C Hamano
2022-03-05 0:13 ` [PATCH v4 " Glen Choo
2022-03-05 0:13 ` [PATCH v4 01/13] submodule tests: test for init and update failure output Glen Choo
2022-03-05 0:13 ` [PATCH v4 02/13] submodule--helper: remove update-module-mode Glen Choo
2022-03-05 0:13 ` [PATCH v4 03/13] submodule--helper: reorganize code for sh to C conversion Glen Choo
2022-03-05 0:13 ` [PATCH v4 04/13] submodule--helper run-update-procedure: remove --suboid Glen Choo
2022-03-05 0:13 ` [PATCH v4 05/13] submodule--helper: get remote names from any repository Glen Choo
2022-03-05 0:13 ` [PATCH v4 06/13] submodule--helper: don't use bitfield indirection for parse_options() Glen Choo
2022-03-05 0:13 ` [PATCH v4 07/13] submodule--helper run-update-procedure: learn --remote Glen Choo
2022-03-05 0:13 ` [PATCH v4 08/13] submodule--helper: refactor get_submodule_displaypath() Glen Choo
2022-03-05 0:13 ` [PATCH v4 09/13] submodule--helper: allow setting superprefix for init_submodule() Glen Choo
2022-03-05 0:13 ` [PATCH v4 10/13] submodule--helper update-clone: learn --init Glen Choo
2022-03-05 0:13 ` [PATCH v4 11/13] submodule--helper: remove ensure-core-worktree Glen Choo
2022-03-05 0:14 ` [PATCH v4 12/13] submodule update: add tests for --filter Glen Choo
2022-03-05 0:14 ` [PATCH v4 13/13] submodule--helper update-clone: check for --filter and --init Glen Choo
2022-03-05 0:40 ` [PATCH v4 00/13] submodule: convert parts of 'update' to C 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=220303.86o82n5oyp.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=chooglen@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).