summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-08-16 16:06:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-16 17:02:55 (GMT)
commit3e7dd9920823fc2a88f8ec5390bd100d707f9129 (patch)
tree199eab0c05cafd2690a62957156419cc0c7bfb66 /builtin
parent4dde7b8799dec0e7aecb04fdc55c656e674cff6f (diff)
downloadgit-3e7dd9920823fc2a88f8ec5390bd100d707f9129.zip
git-3e7dd9920823fc2a88f8ec5390bd100d707f9129.tar.gz
git-3e7dd9920823fc2a88f8ec5390bd100d707f9129.tar.bz2
cherry-pick: fix --quit not deleting CHERRY_PICK_HEAD
--quit is supposed to be --abort but without restoring HEAD. Leaving CHERRY_PICK_HEAD behind could make other commands mistake that cherry-pick is still ongoing (e.g. "git commit --amend" will refuse to work). Clean it too. For --abort, this job of deleting CHERRY_PICK_HEAD is on "git reset" so we don't need to do anything else. But let's add extra checks in --abort tests to confirm. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/revert.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/builtin/revert.c b/builtin/revert.c
index b9d927e..baf1cd7 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -7,6 +7,7 @@
#include "rerere.h"
#include "dir.h"
#include "sequencer.h"
+#include "branch.h"
/*
* This implements the builtins revert and cherry-pick.
@@ -191,8 +192,12 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts)
opts->gpg_sign = xstrdup_or_null(opts->gpg_sign);
opts->strategy = xstrdup_or_null(opts->strategy);
- if (cmd == 'q')
- return sequencer_remove_state(opts);
+ if (cmd == 'q') {
+ int ret = sequencer_remove_state(opts);
+ if (!ret)
+ remove_branch_state();
+ return ret;
+ }
if (cmd == 'c')
return sequencer_continue(opts);
if (cmd == 'a')