Re: [PATCH] am: fix error message in parse_opt_show_current_patch()
From: Junio C Hamano <hidden>
Date: 2023-09-21 19:47:22
Oswald Buddenhagen [off-list ref] writes:
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 <redacted> --- fwiw, this is currently the only message that actually uses the %s=%s format, so as of now, factoring out the argument names has only theoretical value.
I am not sure I follow, if you mean that the programmer needs to pass "--show-current-patch" only once if we used something like "%1$s=%2s and %1$s=%3s", I agree that it probably has little value. The patch looks good. It seems that we are seeing a crack in test coverage, by the way? Will queue. Thanks.
quoted hunk
diff --git a/builtin/am.c b/builtin/am.c index 202040b62e..6655059a57 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;