am: support --quit

Among the "in progress" commands, only git-am and git-merge do not
support --quit. Support --quit in git-am too.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 12879e4029a7710e2d78bae476f7ad7d9b0fe830..460662e4b92b56c25989c9d1770165ea9a6a16a2 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -16,7 +16,7 @@ SYNOPSIS
         [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
         [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
         [(<mbox> | <Maildir>)...]
         [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
         [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
         [(<mbox> | <Maildir>)...]

-'git am' (--continue | --skip | --abort)
+'git am' (--continue | --skip | --abort | --quit)

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


@@ -167,6 +167,10 @@ default.   You can use `--no-utf8` to override this.
 --abort::
        Restore the original branch and abort the patching operation.
 
 --abort::
        Restore the original branch and abort the patching operation.
 

+--quit::
+       Abort the patching operation but keep HEAD and the index
+       untouched.
+

 DISCUSSION
 ----------
 
 DISCUSSION
 ----------
 

diff --git a/builtin/am.c b/builtin/am.c
index 5bdd2d75781076636f93800520e9ed161295724f..793c1e276520b311b122f4d0ad817c8f6f10fe45 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -2149,7 +2149,8 @@ enum resume_mode {
        RESUME_APPLY,
        RESUME_RESOLVED,
        RESUME_SKIP,
        RESUME_APPLY,
        RESUME_RESOLVED,
        RESUME_SKIP,

-       RESUME_ABORT
+       RESUME_ABORT,
+       RESUME_QUIT

 };
 
 static int git_am_config(const char *k, const char *v, void *cb)
 };
 
 static int git_am_config(const char *k, const char *v, void *cb)


@@ -2249,6 +2250,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)
                OPT_CMDMODE(0, "abort", &resume,
                        N_("restore the original branch and abort the patching operation."),
                        RESUME_ABORT),
                OPT_CMDMODE(0, "abort", &resume,
                        N_("restore the original branch and abort the patching operation."),
                        RESUME_ABORT),

+               OPT_CMDMODE(0, "quit", &resume,
+                       N_("abort the patching operation but keep HEAD where it is."),
+                       RESUME_QUIT),

                OPT_BOOL(0, "committer-date-is-author-date",
                        &state.committer_date_is_author_date,
                        N_("lie about committer date")),
                OPT_BOOL(0, "committer-date-is-author-date",
                        &state.committer_date_is_author_date,
                        N_("lie about committer date")),


@@ -2317,7 +2321,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
                 * stray directories.
                 */
                if (file_exists(state.dir) && !state.rebasing) {
                 * stray directories.
                 */
                if (file_exists(state.dir) && !state.rebasing) {

-                       if (resume == RESUME_ABORT) {
+                       if (resume == RESUME_ABORT || resume == RESUME_QUIT) {

                                am_destroy(&state);
                                am_state_release(&state);
                                return 0;
                                am_destroy(&state);
                                am_state_release(&state);
                                return 0;


@@ -2359,6 +2363,10 @@ int cmd_am(int argc, const char **argv, const char *prefix)
        case RESUME_ABORT:
                am_abort(&state);
                break;
        case RESUME_ABORT:
                am_abort(&state);
                break;

+       case RESUME_QUIT:
+               am_rerere_clear();
+               am_destroy(&state);
+               break;

        default:
                die("BUG: invalid resume value");
        }
        default:
                die("BUG: invalid resume value");
        }

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 88813e91244d820b4aa2c0fb5e60a44db03c3e59..c7d5c7af29a8e9595375a535af59549b01da1b49 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1077,7 +1077,7 @@ _git_am ()
 {
        __git_find_repo_path
        if [ -d "$__git_repo_path"/rebase-apply ]; then
 {
        __git_find_repo_path
        if [ -d "$__git_repo_path"/rebase-apply ]; then

-               __gitcomp "--skip --continue --resolved --abort"
+               __gitcomp "--skip --continue --resolved --abort --quit"

                return
        fi
        case "$cur" in
                return
        fi
        case "$cur" in

diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 73b67b4280b99e0328e201e6b69c3d88b766ea84..512c754e02a84ee0beb467d3862b0d677c7aae2c 100755 (executable)
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -1045,4 +1045,16 @@ test_expect_success 'am works with multi-line in-body headers' '
        git cat-file commit HEAD | grep "^$LONG$"
 '
 
        git cat-file commit HEAD | grep "^$LONG$"
 '
 

+test_expect_success 'am --quit keeps HEAD where it is' '
+       mkdir .git/rebase-apply &&
+       >.git/rebase-apply/last &&
+       >.git/rebase-apply/next &&
+       git rev-parse HEAD^ >.git/ORIG_HEAD &&
+       git rev-parse HEAD >expected &&
+       git am --quit &&
+       test_path_is_missing .git/rebase-apply &&
+       git rev-parse HEAD >actual &&
+       test_cmp expected actual
+'
+

 test_done
 test_done