From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Taylor Blau <me@ttaylorr.com>
Cc: git@vger.kernel.org, jacob@initialcommit.io, peff@peff.net,
gitster@pobox.com
Subject: Re: [PATCH 3/7] shortlog: extract `--group` fragment for translation
Date: Tue, 11 Oct 2022 12:55:10 +0200 [thread overview]
Message-ID: <221011.867d16pr0n.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <c3f50465cba4430b2014a76c5e473b906db50059.1665448437.git.me@ttaylorr.com>
On Mon, Oct 10 2022, Taylor Blau wrote:
> The subsequent commit will add another unhandled case in
> `read_from_stdin()` which will want to use the same message as with
> `--group=trailer`.
>
> Extract the "--group=trailer" part from this message so the same
> translation key can be used for both cases.
>
> Signed-off-by: Taylor Blau <me@ttaylorr.com>
> ---
> builtin/shortlog.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/shortlog.c b/builtin/shortlog.c
> index 53c379a51d..051c97bd5a 100644
> --- a/builtin/shortlog.c
> +++ b/builtin/shortlog.c
> @@ -132,7 +132,7 @@ static void read_from_stdin(struct shortlog *log)
> match = committer_match;
> break;
> case SHORTLOG_GROUP_TRAILER:
> - die(_("using --group=trailer with stdin is not supported"));
> + die(_("using %s with stdin is not supported"), "--group=trailer");
> default:
> BUG("unhandled shortlog group");
> }
Rather than add another translation that you can use in 2x places here
(with 4/7) instead do:
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 7a1e1fe7c0e..59aef24f637 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -132,7 +132,8 @@ static void read_from_stdin(struct shortlog *log)
match = committer_match;
break;
case SHORTLOG_GROUP_TRAILER:
- die(_("using --group=trailer with stdin is not supported"));
+ die(_("options '%s' and '%s' cannot be used together"),
+ "--group=<trailer>", "--stdin");
default:
BUG("unhandled shortlog group");
}
Which as you can see with "git grep 'cannot be used together'" we
already use in a lot of places.
We should probably extract this to a:
die_opt_2_incompatible("--group=<trailer>", "--stdin");
But that can all be done in some hypothetical future, but for now the
status quo is that we know of these common strings, and copy/paste them
in various files.
next prev parent reply other threads:[~2022-10-11 10:57 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-11 0:33 [PATCH 0/7] shortlog: introduce `--group=<format>` Taylor Blau
2022-10-11 0:34 ` [PATCH 1/7] Documentation: extract date-options.txt Taylor Blau
2022-10-11 0:54 ` Jeff King
2022-10-11 1:02 ` Taylor Blau
2022-10-11 0:34 ` [PATCH 2/7] shortlog: accept `--date`-related options Taylor Blau
2022-10-11 0:48 ` Jeff King
2022-10-11 1:14 ` Taylor Blau
2022-10-11 0:34 ` [PATCH 3/7] shortlog: extract `--group` fragment for translation Taylor Blau
2022-10-11 10:55 ` Ævar Arnfjörð Bjarmason [this message]
2022-10-11 13:24 ` Jeff King
2022-10-11 0:34 ` [PATCH 4/7] shortlog: support arbitrary commit format `--group`s Taylor Blau
2022-10-11 1:12 ` Jeff King
2022-10-11 1:24 ` Taylor Blau
2022-10-11 1:28 ` Taylor Blau
2022-10-11 2:03 ` Jeff King
2022-10-11 2:02 ` Jeff King
2022-10-21 2:39 ` Taylor Blau
2022-10-21 5:21 ` Jeff King
2022-10-21 22:12 ` Taylor Blau
2022-10-11 0:34 ` [PATCH 5/7] shortlog: implement `--group=author` in terms of `--group=<format>` Taylor Blau
2022-10-11 1:34 ` Jeff King
2022-10-11 1:48 ` Taylor Blau
2022-10-11 2:15 ` Jeff King
2022-10-21 2:03 ` Taylor Blau
2022-10-21 2:02 ` Taylor Blau
2022-10-21 5:03 ` Jeff King
2022-10-21 22:05 ` Taylor Blau
2022-10-11 10:57 ` Ævar Arnfjörð Bjarmason
2022-10-11 11:07 ` Ævar Arnfjörð Bjarmason
2022-10-11 0:34 ` [PATCH 6/7] shortlog: implement `--group=committer` " Taylor Blau
2022-10-11 1:35 ` Jeff King
2022-10-11 0:34 ` [PATCH 7/7] shortlog: implement `--group=trailer` " Taylor Blau
2022-10-11 1:50 ` Jeff King
2022-10-11 1:57 ` Jeff King
2022-10-21 1:38 ` Taylor Blau
2022-10-21 3:11 ` [PATCH v2 0/6] shortlog: introduce `--group=<format>` Taylor Blau
2022-10-21 3:11 ` [PATCH v2 1/6] shortlog: accept `--date`-related options Taylor Blau
2022-10-21 5:32 ` Jeff King
2022-10-21 21:55 ` Taylor Blau
2022-10-21 3:11 ` [PATCH v2 2/6] shortlog: make trailer insertion a noop when appropriate Taylor Blau
2022-10-21 5:38 ` Jeff King
2022-10-21 21:57 ` Taylor Blau
2022-10-21 3:11 ` [PATCH v2 3/6] shortlog: extract `--group` fragment for translation Taylor Blau
2022-10-21 5:40 ` Jeff King
2022-10-21 3:11 ` [PATCH v2 4/6] shortlog: support arbitrary commit format `--group`s Taylor Blau
2022-10-21 5:48 ` Jeff King
2022-10-21 22:07 ` Taylor Blau
2022-10-21 3:11 ` [PATCH v2 5/6] shortlog: implement `--group=author` in terms of `--group=<format>` Taylor Blau
2022-10-21 5:50 ` Jeff King
2022-10-21 3:11 ` [PATCH v2 6/6] shortlog: implement `--group=committer` " Taylor Blau
2022-10-21 5:51 ` Jeff King
2022-10-21 5:53 ` [PATCH v2 0/6] shortlog: introduce `--group=<format>` Jeff King
2022-10-21 22:25 ` [PATCH v3 0/7] " Taylor Blau
2022-10-21 22:25 ` [PATCH v3 1/7] shortlog: accept `--date`-related options Taylor Blau
2022-10-21 22:25 ` [PATCH v3 2/7] shortlog: make trailer insertion a noop when appropriate Taylor Blau
2022-10-21 22:25 ` [PATCH v3 3/7] shortlog: extract `--group` fragment for translation Taylor Blau
2022-10-21 22:25 ` [PATCH v3 4/7] shortlog: support arbitrary commit format `--group`s Taylor Blau
2022-10-22 0:28 ` Jeff King
2022-10-21 22:25 ` [PATCH v3 5/7] shortlog: extract `shortlog_finish_setup()` Taylor Blau
2022-10-21 22:25 ` [PATCH v3 6/7] shortlog: implement `--group=author` in terms of `--group=<format>` Taylor Blau
2022-10-21 22:25 ` [PATCH v3 7/7] shortlog: implement `--group=committer` " Taylor Blau
2022-10-22 0:31 ` [PATCH v3 0/7] shortlog: introduce `--group=<format>` Jeff King
2022-10-24 18:55 ` [PATCH " Taylor Blau
2022-10-24 18:55 ` [PATCH 1/7] shortlog: accept `--date`-related options Taylor Blau
2022-10-24 18:55 ` [PATCH 2/7] shortlog: make trailer insertion a noop when appropriate Taylor Blau
2022-10-24 18:55 ` [PATCH 3/7] shortlog: extract `--group` fragment for translation Taylor Blau
2022-10-24 18:55 ` [PATCH 4/7] shortlog: support arbitrary commit format `--group`s Taylor Blau
2022-10-24 18:55 ` [PATCH 5/7] shortlog: extract `shortlog_finish_setup()` Taylor Blau
2022-10-24 18:55 ` [PATCH 6/7] shortlog: implement `--group=author` in terms of `--group=<format>` Taylor Blau
2022-10-24 18:55 ` [PATCH 7/7] shortlog: implement `--group=committer` " Taylor Blau
2022-10-24 21:59 ` [PATCH 0/7] shortlog: introduce `--group=<format>` Junio C Hamano
2022-10-24 23:45 ` Jeff King
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=221011.867d16pr0n.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob@initialcommit.io \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
/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.
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 NNTP newsgroup(s).