diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2015-06-18 16:38:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-29 20:12:43 (GMT) |
| commit | 0e0aff4b4ca93053a83578cb040475c6e3185f2d (patch) | |
| tree | bbbd4458915698daf4fd50b4a17b322d734b52b4 /git-rebase--interactive.sh | |
| parent | d17ec3a9daffd7f525f39b52011dc653afcbd275 (diff) | |
| download | git-0e0aff4b4ca93053a83578cb040475c6e3185f2d.zip git-0e0aff4b4ca93053a83578cb040475c6e3185f2d.tar.gz git-0e0aff4b4ca93053a83578cb040475c6e3185f2d.tar.bz2 | |
rebase -i: do not leave a CHERRY_PICK_HEAD file behind
When skipping commits whose changes were already applied via `git rebase
--continue`, we need to clean up said file explicitly.
The same is not true for `git rebase --skip` because that will execute
`git reset --hard` as part of the "skip" handling in git-rebase.sh, even
before git-rebase--interactive.sh is called.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 b64dd28..3b36122 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -836,7 +836,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 |