Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.0

diff --git a/builtin-commit.c b/builtin-commit.c
index 1e08399919fb40f710236d223c12528648e6f40a..6cbdd55f168507259a17b64a19ad29310c6d3397 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -625,7 +625,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;
        }