mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/parse-options-reset'

Browse Source 
Command line parser fix.

* jc/parse-options-reset:
  reset: reject --no-(mixed|soft|hard|merge|keep) option
This commit is contained in:
Junio C Hamano
2023-07-27 15:26:37 -07:00
parent d6966f6fff 3821eb6c3d
commit e672bc4f76
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
builtin/reset.c
View File

@ -338,18 +338,25 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
OPT__QUIET(&quiet, N_("be quiet, only report errors")),
OPT_BOOL(0, "no-refresh", &no_refresh,
N_("skip refreshing the index after reset")),
OPT_SET_INT(0, "mixed", &reset_type,
N_("reset HEAD and index"), MIXED),
OPT_SET_INT(0, "soft", &reset_type, N_("reset only HEAD"), SOFT),
OPT_SET_INT(0, "hard", &reset_type,
N_("reset HEAD, index and working tree"), HARD),
OPT_SET_INT(0, "merge", &reset_type,
N_("reset HEAD, index and working tree"), MERGE),
OPT_SET_INT(0, "keep", &reset_type,
N_("reset HEAD but keep local changes"), KEEP),
OPT_SET_INT_F(0, "mixed", &reset_type,
N_("reset HEAD and index"),
MIXED, PARSE_OPT_NONEG),
OPT_SET_INT_F(0, "soft", &reset_type,
N_("reset only HEAD"),
SOFT, PARSE_OPT_NONEG),
OPT_SET_INT_F(0, "hard", &reset_type,
N_("reset HEAD, index and working tree"),
HARD, PARSE_OPT_NONEG),
OPT_SET_INT_F(0, "merge", &reset_type,
N_("reset HEAD, index and working tree"),
MERGE, PARSE_OPT_NONEG),
OPT_SET_INT_F(0, "keep", &reset_type,
N_("reset HEAD but keep local changes"),
KEEP, PARSE_OPT_NONEG),
OPT_CALLBACK_F(0, "recurse-submodules", NULL,
"reset", "control recursive updating of submodules",
PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater),
"reset", "control recursive updating of submodules",
PARSE_OPT_OPTARG,
option_parse_recurse_submodules_worktree_updater),
OPT_BOOL('p', "patch", &patch_mode, N_("select hunks interactively")),
OPT_BOOL('N', "intent-to-add", &intent_to_add,
N_("record only the fact that removed paths will be added later")),