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>
Jonathan Nieder committed
Nov 22, 2011 at 05:20 UTC
c427b211b3f5d3f967e5fc7abd526b02f83a7246
2 files changed
+2
-5
builtin/revert.c
-3
@@ -154,9 +154,6 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts)
154
OPT_STRING(0, "strategy", &opts->strategy, "strategy", "merge strategy"),
155
OPT_CALLBACK('X', "strategy-option", &opts, "option",
156
"option for merge strategy", option_parse_x),
157
- { OPTION_BOOLEAN, 0, "reset", &remove_state, NULL,
158
- "alias for --quit (deprecated)",
159
- PARSE_OPT_HIDDEN | PARSE_OPT_NOARG },
157
OPT_END(),
158
OPT_END(),
159
OPT_END(),
t/t3510-cherry-pick-sequence.sh
+2
-2
@@ -95,7 +95,7 @@ test_expect_success '--quit cleans up sequencer state' '
95
test_path_is_missing .git/sequencer
96
'
97
98
-test_expect_success 'cherry-pick --reset (another name for --quit)' '
98
+test_expect_success '--quit keeps HEAD and conflicted index intact' '
99
pristine_detach initial &&
100
cat >expect <<-\EOF &&
101
OBJID
@@ -105,7 +105,7 @@ test_expect_success 'cherry-pick --reset (another name for --quit)' '
105
:000000 100644 OBJID OBJID A unrelated
106
EOF
107
test_must_fail git cherry-pick base..picked &&
108
- git cherry-pick --reset &&
108
+ git cherry-pick --quit &&
109
test_path_is_missing .git/sequencer &&
110
test_must_fail git update-index --refresh &&
111
{