Merge branch 'ds/object-info-for-prefetch-fix' into maint

diff --git a/builtin/commit.c b/builtin/commit.c
index bd4b180c43f51b73da04894f88754b843cd2d0d1..1c9e8e2228c7ce58375bc247c4ad5850a1bd7d2d 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1658,8 +1658,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
                die("%s", err.buf);
        }
 
-       unlink(git_path_cherry_pick_head(the_repository));
-       unlink(git_path_revert_head(the_repository));
+       sequencer_post_commit_cleanup(the_repository);
        unlink(git_path_merge_head(the_repository));
        unlink(git_path_merge_msg(the_repository));
        unlink(git_path_merge_mode(the_repository));