mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
revert: remove --reset compatibility option
Remove the "git cherry-pick --reset" option, which has a different preferred spelling nowadays ("--quit"). Luckily the old --reset name was not around long enough for anyone to get used to it. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
539047c19e
commit
c427b211b3
|
@ -154,9 +154,6 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts)
|
|||
OPT_STRING(0, "strategy", &opts->strategy, "strategy", "merge strategy"),
|
||||
OPT_CALLBACK('X', "strategy-option", &opts, "option",
|
||||
"option for merge strategy", option_parse_x),
|
||||
{ OPTION_BOOLEAN, 0, "reset", &remove_state, NULL,
|
||||
"alias for --quit (deprecated)",
|
||||
PARSE_OPT_HIDDEN | PARSE_OPT_NOARG },
|
||||
OPT_END(),
|
||||
OPT_END(),
|
||||
OPT_END(),
|
||||
|
|
|
@ -95,7 +95,7 @@ test_expect_success '--quit cleans up sequencer state' '
|
|||
test_path_is_missing .git/sequencer
|
||||
'
|
||||
|
||||
test_expect_success 'cherry-pick --reset (another name for --quit)' '
|
||||
test_expect_success '--quit keeps HEAD and conflicted index intact' '
|
||||
pristine_detach initial &&
|
||||
cat >expect <<-\EOF &&
|
||||
OBJID
|
||||
|
@ -105,7 +105,7 @@ test_expect_success 'cherry-pick --reset (another name for --quit)' '
|
|||
:000000 100644 OBJID OBJID A unrelated
|
||||
EOF
|
||||
test_must_fail git cherry-pick base..picked &&
|
||||
git cherry-pick --reset &&
|
||||
git cherry-pick --quit &&
|
||||
test_path_is_missing .git/sequencer &&
|
||||
test_must_fail git update-index --refresh &&
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue