revert: rename --reset option to --quit

The option to "git cherry-pick" and "git revert" to discard the
sequencer state introduced by v1.7.8-rc0~141^2~6 (revert: Introduce
--reset to remove sequencer state, 2011-08-04) has a confusing name.
Change it now, while we still have the time.

The new name for "cherry-pick, please get out of my way, since I've
long forgotten about the sequence of commits I was cherry-picking when
you wrote that old .git/sequencer directory" is --quit.  Mnemonic:
this is analagous to quiting a program the user is no longer using ---
we just want to get out of the multiple-command cherry-pick procedure
and not to reset HEAD or rewind any other old state.

The "--reset" option is kept as a synonym to minimize the impact.  We
might consider dropping it for simplicity in a separate patch, though.

Adjust documentation and tests to use the newly preferred name (--quit)
instead of --reset.  While at it, let's clarify the short descriptions
of these operations in "-h" output.

Before:

--reset		forget the current operation
--continue	continue the current operation

After:

--quit		end revert or cherry-pick sequence
--continue	resume revert or cherry-pick sequence

Noticed-by: Phil Hord <phil.hord@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 2660a842fc2ac76660963bc65c95ca47cb0e97cb..21998b820efbf3b600813bb1c7d32224f61e46c1 100644 (file)
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -9,8 +9,8 @@ SYNOPSIS
 --------
 [verse]
 'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>...
 --------
 [verse]
 'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>...

-'git cherry-pick' --reset

 'git cherry-pick' --continue
 'git cherry-pick' --continue

+'git cherry-pick' --quit

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------

diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index f3519413e7e8704deee0197df6876eaed97e28b0..b0fcabc8b69ff65e00fc18aadf5644ac75786a7b 100644 (file)
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -9,8 +9,8 @@ SYNOPSIS
 --------
 [verse]
 'git revert' [--edit | --no-edit] [-n] [-m parent-number] [-s] <commit>...
 --------
 [verse]
 'git revert' [--edit | --no-edit] [-n] [-m parent-number] [-s] <commit>...

-'git revert' --reset

 'git revert' --continue
 'git revert' --continue

+'git revert' --quit

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------

diff --git a/Documentation/sequencer.txt b/Documentation/sequencer.txt
index 3e6df338bed519eb74cf233f40589ddbfb0da57b..75f8e869e82feb6ad2ff4327a7a95245b39584a8 100644 (file)
--- a/Documentation/sequencer.txt
+++ b/Documentation/sequencer.txt
@@ -1,9 +1,9 @@
---reset::
-       Forget about the current operation in progress.  Can be used
-       to clear the sequencer state after a failed cherry-pick or
-       revert.
-

 --continue::
        Continue the operation in progress using the information in
        '.git/sequencer'.  Can be used to continue after resolving
        conflicts in a failed cherry-pick or revert.
 --continue::
        Continue the operation in progress using the information in
        '.git/sequencer'.  Can be used to continue after resolving
        conflicts in a failed cherry-pick or revert.

+
+--quit::
+       Forget about the current operation in progress.  Can be used
+       to clear the sequencer state after a failed cherry-pick or
+       revert.

diff --git a/builtin/revert.c b/builtin/revert.c
index 544e8c3057b2faf120dcfb219c6f8bcc4dec4b0a..e109fb1178aa4e48ee603c2bceaddfd4cb213777 100644 (file)
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -40,7 +40,7 @@ static const char * const cherry_pick_usage[] = {
 };
 
 enum replay_action { REVERT, CHERRY_PICK };
 };
 
 enum replay_action { REVERT, CHERRY_PICK };

-enum replay_subcommand { REPLAY_NONE, REPLAY_RESET, REPLAY_CONTINUE };
+enum replay_subcommand { REPLAY_NONE, REPLAY_REMOVE_STATE, REPLAY_CONTINUE };

 
 struct replay_opts {
        enum replay_action action;
 
 struct replay_opts {
        enum replay_action action;


@@ -133,11 +133,11 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts)
 {
        const char * const * usage_str = revert_or_cherry_pick_usage(opts);
        const char *me = action_name(opts);
 {
        const char * const * usage_str = revert_or_cherry_pick_usage(opts);
        const char *me = action_name(opts);

-       int reset = 0;
+       int remove_state = 0;

        int contin = 0;
        struct option options[] = {
        int contin = 0;
        struct option options[] = {

-               OPT_BOOLEAN(0, "reset", &reset, "forget the current operation"),
-               OPT_BOOLEAN(0, "continue", &contin, "continue the current operation"),
+               OPT_BOOLEAN(0, "quit", &remove_state, "end revert or cherry-pick sequence"),
+               OPT_BOOLEAN(0, "continue", &contin, "resume revert or cherry-pick sequence"),

                OPT_BOOLEAN('n', "no-commit", &opts->no_commit, "don't automatically commit"),
                OPT_BOOLEAN('e', "edit", &opts->edit, "edit the commit message"),
                OPT_NOOP_NOARG('r', NULL),
                OPT_BOOLEAN('n', "no-commit", &opts->no_commit, "don't automatically commit"),
                OPT_BOOLEAN('e', "edit", &opts->edit, "edit the commit message"),
                OPT_NOOP_NOARG('r', NULL),


@@ -147,6 +147,9 @@ 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(),


@@ -168,13 +171,13 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts)
 
        /* Check for incompatible subcommands */
        verify_opt_mutually_compatible(me,
 
        /* Check for incompatible subcommands */
        verify_opt_mutually_compatible(me,

-                               "--reset", reset,
+                               "--quit", remove_state,

                                "--continue", contin,
                                NULL);
 
        /* Set the subcommand */
                                "--continue", contin,
                                NULL);
 
        /* Set the subcommand */

-       if (reset)
-               opts->subcommand = REPLAY_RESET;
+       if (remove_state)
+               opts->subcommand = REPLAY_REMOVE_STATE;

        else if (contin)
                opts->subcommand = REPLAY_CONTINUE;
        else
        else if (contin)
                opts->subcommand = REPLAY_CONTINUE;
        else


@@ -183,8 +186,8 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts)
        /* Check for incompatible command line arguments */
        if (opts->subcommand != REPLAY_NONE) {
                char *this_operation;
        /* Check for incompatible command line arguments */
        if (opts->subcommand != REPLAY_NONE) {
                char *this_operation;

-               if (opts->subcommand == REPLAY_RESET)
-                       this_operation = "--reset";
+               if (opts->subcommand == REPLAY_REMOVE_STATE)
+                       this_operation = "--quit";

                else
                        this_operation = "--continue";
 
                else
                        this_operation = "--continue";
 


@@ -965,7 +968,7 @@ static int pick_revisions(struct replay_opts *opts)
         * cherry-pick should be handled differently from an existing
         * one that is being continued
         */
         * cherry-pick should be handled differently from an existing
         * one that is being continued
         */

-       if (opts->subcommand == REPLAY_RESET) {
+       if (opts->subcommand == REPLAY_REMOVE_STATE) {

                remove_sequencer_state(1);
                return 0;
        } else if (opts->subcommand == REPLAY_CONTINUE) {
                remove_sequencer_state(1);
                return 0;
        } else if (opts->subcommand == REPLAY_CONTINUE) {


@@ -988,7 +991,7 @@ static int pick_revisions(struct replay_opts *opts)
                if (create_seq_dir() < 0) {
                        error(_("A cherry-pick or revert is in progress."));
                        advise(_("Use --continue to continue the operation"));
                if (create_seq_dir() < 0) {
                        error(_("A cherry-pick or revert is in progress."));
                        advise(_("Use --continue to continue the operation"));

-                       advise(_("or --reset to forget about it"));
+                       advise(_("or --quit to forget about it"));

                        return -1;
                }
                if (get_sha1("HEAD", sha1)) {
                        return -1;
                }
                if (get_sha1("HEAD", sha1)) {

diff --git a/sequencer.h b/sequencer.h
index 905d29501213f058f0d8cc88e7ba57527d506483..f435fdb4b147d2e2ce5480ddb4832228af1cb73b 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -13,7 +13,7 @@
  *
  * With the aggressive flag, it additionally removes SEQ_OLD_DIR,
  * ignoring any errors.  Inteded to be used by the sequencer's
  *
  * With the aggressive flag, it additionally removes SEQ_OLD_DIR,
  * ignoring any errors.  Inteded to be used by the sequencer's

- * '--reset' subcommand.
+ * '--quit' subcommand.

  */
 void remove_sequencer_state(int aggressive);
 
  */
 void remove_sequencer_state(int aggressive);
 

diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 3bca2b3dd5cc252cad615b83f84891f6dc2bacfe..bb67cdcb5d8b0ddb611ea112258e6f9b35896851 100755 (executable)
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -13,7 +13,7 @@ test_description='Test cherry-pick continuation features
 . ./test-lib.sh
 
 pristine_detach () {
 . ./test-lib.sh
 
 pristine_detach () {

-       git cherry-pick --reset &&
+       git cherry-pick --quit &&

        git checkout -f "$1^0" &&
        git read-tree -u --reset HEAD &&
        git clean -d -f -f -q -x
        git checkout -f "$1^0" &&
        git read-tree -u --reset HEAD &&
        git clean -d -f -f -q -x


@@ -70,18 +70,39 @@ test_expect_success 'cherry-pick cleans up sequencer state upon success' '
        test_path_is_missing .git/sequencer
 '
 
        test_path_is_missing .git/sequencer
 '
 

-test_expect_success '--reset does not complain when no cherry-pick is in progress' '
+test_expect_success '--quit does not complain when no cherry-pick is in progress' '

        pristine_detach initial &&
        pristine_detach initial &&

-       git cherry-pick --reset
+       git cherry-pick --quit

 '
 
 '
 

-test_expect_success '--reset cleans up sequencer state' '
+test_expect_success '--quit cleans up sequencer state' '

        pristine_detach initial &&
        test_must_fail git cherry-pick base..picked &&
        pristine_detach initial &&
        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_expect_success 'cherry-pick --reset (another name for --quit)' '
+       pristine_detach initial &&
+       cat >expect <<-\EOF &&
+       OBJID
+       :100644 100644 OBJID OBJID M    unrelated
+       OBJID
+       :000000 100644 OBJID OBJID A    foo
+       :000000 100644 OBJID OBJID A    unrelated
+       EOF
+       test_must_fail git cherry-pick base..picked &&
+       git cherry-pick --reset &&
+       test_path_is_missing .git/sequencer &&
+       test_must_fail git update-index --refresh &&
+       {
+               git rev-list HEAD |
+               git diff-tree --root --stdin |
+               sed "s/$_x40/OBJID/g"
+       } >actual &&
+       test_cmp expect actual
+'
+

 test_expect_success 'cherry-pick cleans up sequencer state when one commit is left' '
        pristine_detach initial &&
        test_must_fail git cherry-pick base..picked &&
 test_expect_success 'cherry-pick cleans up sequencer state when one commit is left' '
        pristine_detach initial &&
        test_must_fail git cherry-pick base..picked &&

diff --git a/t/t7106-reset-sequence.sh b/t/t7106-reset-sequence.sh
index 4956caaf82be8c42ef01a9adae55387e87adaa04..3f86e8c5e8c6fedb569d50ee20cf6d71542e5860 100755 (executable)
--- a/t/t7106-reset-sequence.sh
+++ b/t/t7106-reset-sequence.sh
@@ -12,7 +12,7 @@ test_description='Test interaction of reset --hard with sequencer
 . ./test-lib.sh
 
 pristine_detach () {
 . ./test-lib.sh
 
 pristine_detach () {

-       git cherry-pick --reset &&
+       git cherry-pick --quit &&

        git checkout -f "$1^0" &&
        git read-tree -u --reset HEAD &&
        git clean -d -f -f -q -x
        git checkout -f "$1^0" &&
        git read-tree -u --reset HEAD &&
        git clean -d -f -f -q -x