sequencer (rebase -i): remove CHERRY_PICK_HEAD when no longer needed

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Author: dscho

sequencer.c

@@ -1812,8 +1812,13 @@ static int commit_staged_changes(struct replay_opts *opts)
 
 	if (has_unstaged_changes(1))
 		return error(_("Cannot rebase: You have unstaged changes."));
-	if (!has_uncommitted_changes(0))
+	if (!has_uncommitted_changes(0)) {
+		const char *cherry_pick_head = git_path("CHERRY_PICK_HEAD");
+
+		if (file_exists(cherry_pick_head) && unlink(cherry_pick_head))
+			return error("Could not remove CHERRY_PICK_HEAD");
 		return 0;
+	}
 
 	if (file_exists(git_path_rebase_amend())) {
 		struct strbuf rev = STRBUF_INIT;