Introduce CHERRY_PICK_HEAD

diff --git a/builtin/commit.c b/builtin/commit.c
index 03cff5af631fec975442c528b1ffba264b879c8e..0def5401abdd511afa58b2e5cbc1274786c563db 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1424,6 +1424,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
                die("cannot update HEAD ref");
        }
 
+       unlink(git_path("CHERRY_PICK_HEAD"));
        unlink(git_path("MERGE_HEAD"));
        unlink(git_path("MERGE_MSG"));
        unlink(git_path("MERGE_MODE"));