From 0e0aff4b4ca93053a83578cb040475c6e3185f2d Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 18 Jun 2015 18:38:53 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- git-rebase--interactive.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'git-rebase--interactive.sh') diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index b64dd28acf..3b361229b7 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 -- cgit v1.2.3