[PATCH] am: fix error message in parse_opt_show_current_patch()
- From
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
- Date
- Sep 21, 2023, 11:07 UTC
- Message-ID
- <20230921110727.789156-1-oswald.buddenhagen@gmx.de>
- In-Reply-To
- <fff19abd-263d-48c7-81fd-35a2766b6b16@web.de>
The argument order was incorrect. This was introduced by 246cac8505 (i18n: turn even more messages into "cannot be used together" ones, 2022-01-05).
Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
--- fwiw, this is currently the only message that actually uses the %s=%s format, so as of now, factoring out the argument names has only theoretical value.
Cc: Jean-Noël Avila <jn.avila@free.fr> Cc: Johannes Sixt <j6t@kdbg.org> Cc: René Scharfe <l.s.r@web.de> Cc: Junio C Hamano <gitster@pobox.com> --- builtin/am.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/am.c b/builtin/am.c index 202040b62e..6655059a57 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2303,7 +2303,8 @@ static int parse_opt_show_current_patch(const struct option *opt, const char *ar if (resume->mode == RESUME_SHOW_PATCH && new_value != resume->sub_mode) return error(_("options '%s=%s' and '%s=%s' " "cannot be used together"), - "--show-current-patch", "--show-current-patch", arg, valid_modes[resume->sub_mode]); + "--show-current-patch", arg, + "--show-current-patch", valid_modes[resume->sub_mode]); resume->mode = RESUME_SHOW_PATCH; resume->sub_mode = new_value;
-- 2.42.0.419.g70bf8a5751