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>

diff --git a/builtin/revert.c b/builtin/revert.c
index 70a5fbb672f14bec432447b37ce9b012577fe510..0c61668b858671c4817e1445de01812fcc53f92d 100644 (file)
--- 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),
                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(),
                OPT_END(),
                OPT_END(),
                OPT_END(),

diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index e97397f96b29d9f20183c99999ec5bf7923549e7..2c4c1c851dcbb1cd38edc2a2620e2b04e36f7192 100755 (executable)
--- 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_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
        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 &&
        :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 &&
        {
        test_path_is_missing .git/sequencer &&
        test_must_fail git update-index --refresh &&
        {