Merge branch 'maint-1.6.0' into maint

* maint-1.6.0: builtin-fsck: fix off by one head count Documentation: let asciidoc align related options githooks.txt: add missing word builtin-commit.c: do not remove COMMIT_EDITMSG
2009-01-17 22:39:49 -08:00
parent 8ee09acd8f 3aed2fda6f
commit 78f111e12d
4 changed files with 6 additions and 4 deletions
--- 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;
 	}