]> git.ipfire.org Git - thirdparty/git.git/commitdiff
am: fix error message in parse_opt_show_current_patch()
authorOswald Buddenhagen <oswald.buddenhagen@gmx.de>
Thu, 21 Sep 2023 11:07:27 +0000 (13:07 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Sep 2023 19:09:33 +0000 (12:09 -0700)
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>
builtin/am.c

index 8bde034fae68bcdd8fc0f0b9b61837d29608d62b..37d7c7c6f39eab33ce0c0cb2a34d828d5531c74a 100644 (file)
@@ -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;