Skip to content

Commit

Permalink
am: fix error message in parse_opt_show_current_patch()
Browse files Browse the repository at this point in the history
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 <oswald.buddenhagen@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
ossilator authored and gitster committed Sep 21, 2023
1 parent 43c8a30 commit 43abaaf
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion builtin/am.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 43abaaf

Please sign in to comment.