diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 17:41:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 17:41:34 (GMT) |
| commit | 29dce32f79765cb3c2ed4c3b8ef439e5e399af8e (patch) | |
| tree | 1e3b6d8b67cd926af37bd4239f5e690ffa1e6f94 /git-rebase--interactive.sh | |
| parent | de67af4a8fa123fff6161eb10a2ed4fd02fa1f4c (diff) | |
| parent | 0e0aff4b4ca93053a83578cb040475c6e3185f2d (diff) | |
| download | git-29dce32f79765cb3c2ed4c3b8ef439e5e399af8e.zip git-29dce32f79765cb3c2ed4c3b8ef439e5e399af8e.tar.gz git-29dce32f79765cb3c2ed4c3b8ef439e5e399af8e.tar.bz2 | |
Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maint
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 8c5de4c..0564ad4 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 |