undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert: remove --reset compatibility option

Browse Source 
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:
Jonathan Nieder 2011-11-22 05:20:46 -06:00 committed by Junio C Hamano
parent 539047c19e
commit c427b211b3
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/revert.c
View File

@ -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_STRING(0, "strategy", &opts->strategy, "strategy", "merge strategy"),
OPT_CALLBACK('X', "strategy-option", &opts, "option", OPT_CALLBACK('X', "strategy-option", &opts, "option",
"option for merge strategy", option_parse_x), "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(), OPT_END(),
OPT_END(), OPT_END(),

4
t/t3510-cherry-pick-sequence.sh
View File

@ -95,7 +95,7 @@ test_expect_success '--quit cleans up sequencer state' '
test_path_is_missing .git/sequencer 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 && pristine_detach initial &&
cat >expect <<-\EOF && cat >expect <<-\EOF &&
OBJID OBJID
@ -105,7 +105,7 @@ test_expect_success 'cherry-pick --reset (another name for --quit)' '
:000000 100644 OBJID OBJID A unrelated :000000 100644 OBJID OBJID A unrelated
EOF EOF
test_must_fail git cherry-pick base..picked && test_must_fail git cherry-pick base..picked &&
git cherry-pick --reset && git cherry-pick --quit &&
test_path_is_missing .git/sequencer && test_path_is_missing .git/sequencer &&
test_must_fail git update-index --refresh && test_must_fail git update-index --refresh &&
{ {