threads / patch / 58857

patchi18n: fix command template placeholder format

Subject: [PATCH] i18n: fix command template placeholder format

## tl;dr

5 messages between Nov 26, 2022 and Nov 28, 2022. Diffs are folded; open one to read it.

replies: 4people: 4as markdown or json

Jean-Noël Avila via GitGitGadget· Nov 26, 2022, 17:24 UTC · lore
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
---
    i18n: fix command template placeholder format
    
    This patch applies to the revision 2.39 rc0 during the l10n process.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1435%2Fjnavila%2Ffix_i18n_v2.39-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1435/jnavila/fix_i18n_v2.39-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1435
 Documentation/git-revert.txt | 2 +-
 builtin/revert.c             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Show changes to 2 files +2 −2

Documentation/git-revert.txt, builtin/revert.c

diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index 5016755efb6..d2e10d3dceb 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -8,7 +8,7 @@ git-revert - Revert some existing commits
 SYNOPSIS
 --------
 [verse]
-'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>...
+'git revert' [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] <commit>...
 'git revert' (--continue | --skip | --abort | --quit)
 
 DESCRIPTION
diff --git a/builtin/revert.c b/builtin/revert.c
index ee32c714a76..6a9b550a61f 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -21,7 +21,7 @@
  */
 
 static const char * const revert_usage[] = {
-	N_("git revert [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>..."),
+	N_("git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] <commit>..."),
 	N_("git revert (--continue | --skip | --abort | --quit)"),
 	NULL
 };

base-commit: c000d916380bb59db69c78546928eadd076b9c7d

-- 
gitgitgadget
Todd Zullinger· Nov 27, 2022, 04:30 UTC · re: Junio C Hamano · lore

Re: [PATCH] i18n: fix command template placeholder format

Junio C Hamano wrote:
Show 7 quoted lines
> "Jean-Noël Avila via GitGitGadget"  <gitgitgadget@gmail.com> writes:
> 
>>     i18n: fix command template placeholder format
>>     
>>     This patch applies to the revision 2.39 rc0 during the l10n process.
> 
> Thanks, will queue.

In case its helpful, an identical patch was sent on Wednesday, Subject: [PATCH] revert: add angle bracket around argument 'parent-number' in usage.

    <pull.1386.git.git.1669241489179.gitgitgadget@gmail.com>
Its commit message notes:
    8c9e292dc0 (doc txt & -h consistency: add missing
    options and labels, 2022-10-13) adds detailed usage line
    for revert and cherry-pick, which both contain a flag
    `-m` for parent number.
    Angle brackets shall be marked around parent-number,
    since it represents
    an argument.
-- 
Todd
Junio C Hamano· Nov 28, 2022, 13:41 UTC · re: Todd Zullinger · lore

Re: [PATCH] i18n: fix command template placeholder format

Todd Zullinger <tmz@pobox.com> writes:
Show 5 quoted lines
>> Thanks, will queue.
>
> In case its helpful, an identical patch was sent on
> Wednesday, Subject: [PATCH] revert: add angle bracket around
> argument 'parent-number' in usage.

Yup, more eyes finding the same issue is very good and is very much appreciated. And in a case like this trivial one, it is not surprising that there is only a single way to make it correct.

Thanks, all, again for your contributions.
Bagas Sanjaya· Nov 28, 2022, 08:37 UTC · re: Jean-Noël Avila via GitGitGadget · lore

Re: [PATCH] i18n: fix command template placeholder format

On 11/27/22 00:24, Jean-Noël Avila via GitGitGadget wrote:
 >  static const char * const revert_usage[] = {
Show 6 quoted lines
> -	N_("git revert [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>..."),
> +	N_("git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] <commit>..."),
>  	N_("git revert (--continue | --skip | --abort | --quit)"),
>  	NULL
>  };
> 
Looks OK, thanks!
Reviewed-by: Bagas Sanjaya <bagasdotme@gmail.com>
-- 
An old man doll... just what I always wanted! - Clara

← back to recent threads