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

reset: reject --no-(mixed|soft|hard|merge|keep) option 

"git reset --no-mixed" behaved exactly like "git reset --mixed",
which was nonsense.

If there were only two kinds, e.g. "mixed" vs "separate", it might
have made sense to make "git reset --no-mixed" behave identically to
"git reset --separate" and vice-versa, but because we have many
types of reset, let's just forbid "--no-mixed" and negated form of
other types.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2023-07-19 06:37:39 -07:00
parent fb7d80edca
commit 3821eb6c3d
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
builtin/reset.c
View File

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

10
t/t7102-reset.sh
View File

@ -71,6 +71,16 @@ check_changes () {
done | test_cmp .cat_expect - done | test_cmp .cat_expect -
} }


# no negated form for various type of resets
for opt in soft mixed hard merge keep
do
test_expect_success "no 'git reset --no-$opt'" '
test_when_finished "rm -f err" &&
test_must_fail git reset --no-$opt 2>err &&
grep "error: unknown option .no-$opt." err
'
done

test_expect_success 'reset --hard message' ' test_expect_success 'reset --hard message' '
hex=$(git log -1 --format="%h") && hex=$(git log -1 --format="%h") &&
git reset --hard >.actual && git reset --hard >.actual &&