Skip to content

Commit 43abaaf

Browse files
ossilatorgitster
authored andcommitted
am: fix error message in parse_opt_show_current_patch()
The argument order was incorrect. This was introduced by 246cac8 (i18n: turn even more messages into "cannot be used together" ones, 2022-01-05). Signed-off-by: Oswald Buddenhagen <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 43c8a30 commit 43abaaf

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

builtin/am.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2303,7 +2303,8 @@ static int parse_opt_show_current_patch(const struct option *opt, const char *ar
23032303
if (resume->mode == RESUME_SHOW_PATCH && new_value != resume->sub_mode)
23042304
return error(_("options '%s=%s' and '%s=%s' "
23052305
"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]);
23072308

23082309
resume->mode = RESUME_SHOW_PATCH;
23092310
resume->sub_mode = new_value;

0 commit comments

Comments
 (0)