kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ob/am-msgfix' 

The parameters to generate an error message have been corrected.

* ob/am-msgfix:
  am: fix error message in parse_opt_show_current_patch()
maint
Junio C Hamano 2023-09-29 09:04:16 -07:00
parent a4eebfadf2 43abaaf008
commit a03cc4ba1d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/am.c
View 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) if (resume->mode == RESUME_SHOW_PATCH && new_value != resume->sub_mode)
return error(_("options '%s=%s' and '%s=%s' " return error(_("options '%s=%s' and '%s=%s' "
"cannot be used together"), "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->mode = RESUME_SHOW_PATCH;
resume->sub_mode = new_value; resume->sub_mode = new_value;