From: Oswald Buddenhagen Date: Thu, 21 Sep 2023 11:07:27 +0000 (+0200) Subject: am: fix error message in parse_opt_show_current_patch() X-Git-Tag: v2.42.1~12^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43abaaf0087c72fccc5bbf3fc103eb148465480d;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin/am.c b/builtin/am.c index 8bde034fae..37d7c7c6f3 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;