Merge branch 'mh/maint-commit-color-status' into maint

diff --git a/builtin-commit.c b/builtin-commit.c
index 7cf227a1b152df7a4a06b4fe546d7f7cb1a47ae0..2f0b00a174ff970939d2758334cb8d1dca41cb42 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -624,7 +624,6 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
        if (!commitable && !in_merge && !allow_empty &&
            !(amend && is_a_merge(head_sha1))) {
                run_status(stdout, index_file, prefix, 0);
-               unlink(commit_editmsg);
                return 0;
        }