[PATCH v5 05/11] i18n: tag.c factorize i18n strings
From: Jean-Noël Avila via GitGitGadget <hidden>
Date: 2022-01-05 20:02:47
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <redacted> Signed-off-by: Jean-Noël Avila <redacted> --- builtin/tag.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/builtin/tag.c b/builtin/tag.c
index dfdcfd37956..8f372a41078 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,15 +543,19 @@ 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")); - if (filter.reachable_from || filter.unreachable_from) - die(_("--merged and --no-merged options are 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"; + else if (filter.reachable_from) + only_in_list = "--merged"; + else if (filter.unreachable_from) + only_in_list = "--no-merged"; + if (only_in_list) + die(_("the '%s' option is only allowed in list mode"), only_in_list); if (cmdmode == 'd') { ret = delete_tags(argv); goto cleanup;
--
gitgitgadget