Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'
[git/git.git] / git-rebase--interactive.sh
index dc3133f..5ff0f1c 100644 (file)
@@ -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