diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-13 23:00:25 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-13 23:00:25 +0200 |
| commit | e01787f1a1de589b7adc6f6946b53996a5e74c34 (patch) | |
| tree | 470370b475717ef3a0fc878e67d399a1b5d2525f /git-rebase--interactive.sh | |
| parent | Merge branch 'et/http-proxyauth' (diff) | |
| parent | rebase -i: do not leave a CHERRY_PICK_HEAD file behind (diff) | |
| download | git-e01787f1a1de589b7adc6f6946b53996a5e74c34.tar.xz git-e01787f1a1de589b7adc6f6946b53996a5e74c34.zip | |
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.sh | 6 |
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 |