From: René Scharfe Date: Sat, 01 Jan 2022 14:14:39 GMT Subject: Re: [PATCH v3 05/11] i18n: tag.c factorize i18n strings Message-ID: <68377030-f15c-d2f9-faec-c802529c5f46@web.de> In-Reply-To: <2d83654c48a75cd50573f472d643851d950ebafc.1640804108.git.gitgitgadget@gmail.com> Am 29.12.21 um 19:55 schrieb Jean-Noël Avila via GitGitGadget: > From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= > > Signed-off-by: Jean-Noël Avila > --- > builtin/tag.c | 17 ++++++++++------- > 1 file changed, 10 insertions(+), 7 deletions(-) > > diff --git a/builtin/tag.c b/builtin/tag.c > index 6f7cd0e3ef5..c8fcb552ef1 100644 > --- a/builtin/tag.c > +++ b/builtin/tag.c > @@ -483,6 +483,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix) > OPT_END() > }; > int ret = 0; > + const char *only_in_list = NULL; > > setup_ref_filter_porcelain_msg(); > > @@ -542,13 +543,15 @@ int cmd_tag(int argc, const char **argv, const char *prefix) > goto cleanup; > } > if (filter.lines != -1) > - die(_("-n option is only allowed in list mode")); > - if (filter.with_commit) > - die(_("--contains option is only allowed in list mode")); > - if (filter.no_commit) > - die(_("--no-contains option is only allowed in list mode")); > - if (filter.points_at.nr) > - die(_("--points-at option is only allowed in list mode")); > + only_in_list = "-n"; > + else if (filter.with_commit) > + only_in_list = "--contains"; > + else if (filter.no_commit) > + only_in_list = "--no-contains"; > + else if (filter.points_at.nr) > + only_in_list = "--points-at"; > + if (only_in_list) > + die(_("the '%s' option is only allowed in list mode"), only_in_list); > if (filter.reachable_from || filter.unreachable_from) > die(_("--merged and --no-merged options are only allowed in list mode")); Shouldn't these two be changed as well? > if (cmdmode == 'd') {