summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-07-13 14:00:25 -0700
committerJunio C Hamano <gitster@pobox.com>2015-07-13 14:00:25 -0700
commite01787f1a1de589b7adc6f6946b53996a5e74c34 (patch)
tree470370b475717ef3a0fc878e67d399a1b5d2525f /git-rebase--interactive.sh
parent0e521a41b526f6dbde76030ca7e7c1107115c120 (diff)
parent0e0aff4b4ca93053a83578cb040475c6e3185f2d (diff)
downloadgit-e01787f1a1de589b7adc6f6946b53996a5e74c34.tar.gz
Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'
Abandoning an already applied change in "git rebase -i" with "--continue" left CHERRY_PICK_HEAD and confused later steps. * js/rebase-i-clean-up-upon-continue-to-skip: rebase -i: do not leave a CHERRY_PICK_HEAD file behind t3404: demonstrate CHERRY_PICK_HEAD bug
Diffstat (limited to 'git-rebase--interactive.sh')
-rw-r--r--git-rebase--interactive.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index dc3133f681..5ff0f1c81a 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -849,7 +849,11 @@ continue)
# do we have anything to commit?
if git diff-index --cached --quiet HEAD --
then
- : Nothing to commit -- skip this
+ # Nothing to commit -- skip this commit
+
+ test ! -f "$GIT_DIR"/CHERRY_PICK_HEAD ||
+ rm "$GIT_DIR"/CHERRY_PICK_HEAD ||
+ die "Could not remove CHERRY_PICK_HEAD"
else
if ! test -f "$author_script"
then