am: fix error message in parse_opt_show_current_patch()
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Oswald Buddenhagen committed
Sep 21, 2023 at 13:07 UTC
43abaaf0087c72fccc5bbf3fc103eb148465480d
1 file changed
+2
-1
builtin/am.c
+2
-1
@@ -2303,7 +2303,8 @@ static int parse_opt_show_current_patch(const struct option *opt, const char *ar
2303
if (resume->mode == RESUME_SHOW_PATCH && new_value != resume->sub_mode)
2304
return error(_("options '%s=%s' and '%s=%s' "
2305
"cannot be used together"),
2306
- "--show-current-patch", "--show-current-patch", arg, valid_modes[resume->sub_mode]);
2306
+ "--show-current-patch", arg,
2307
+ "--show-current-patch", valid_modes[resume->sub_mode]);
2308
2309
resume->mode = RESUME_SHOW_PATCH;
2310
resume->sub_mode = new_value;