On Tue, Oct 11, 2022 at 12:55:10PM +0200, Ævar Arnfjörð Bjarmason wrote:
> > 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");
> }
It's not usually --stdin, though. Generally you'd just not provide any
revisions to traverse, and it defaults to stdin. So "with stdin" is IMHO
a more accurate message, as it covers all of the cases.
-Peff
