summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-11-22 11:20:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-11-23 02:18:02 (GMT)
commitc427b211b3f5d3f967e5fc7abd526b02f83a7246 (patch)
tree04d657ad603bfa1310a4b6cca20639e34e3b9e74
parent539047c19ec040819b6f6af2d55714195b812abb (diff)
downloadgit-c427b211b3f5d3f967e5fc7abd526b02f83a7246.zip
git-c427b211b3f5d3f967e5fc7abd526b02f83a7246.tar.gz
git-c427b211b3f5d3f967e5fc7abd526b02f83a7246.tar.bz2
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>
-rw-r--r--builtin/revert.c3
-rwxr-xr-xt/t3510-cherry-pick-sequence.sh4
2 files changed, 2 insertions, 5 deletions
diff --git a/builtin/revert.c b/builtin/revert.c
index 70a5fbb..0c61668 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -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(),
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index e97397f..2c4c1c8 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -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 &&
{