builtin-commit.c: do not remove COMMIT_EDITMSG

sbeyer · gitster · commit 2454ac7b9fbc · 2009-01-17T17:57:35.000-08:00
git-commit tries to remove the file ./COMMIT_EDITMSG instead of $GIT_DIR/COMMIT_EDITMSG after commit preparation (e.g. running hooks, launching editor). This behavior exists since f5bbc32 "Port git commit to C". Some test cases (e.g. t/t7502-commit.sh) rely on the existence of $GIT_DIR/COMMIT_EDITMSG after committing and, I guess, many people are used to it. So it is best not to remove it. This patch just removes the removal of COMMIT_EDITMSG. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git 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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -625,7 +625,6 @@ static int prepare_to_commit(const char index_file, const char prefix)`
`625`	`625`	`if (!commitable && !in_merge && !allow_empty &&`
`626`	`626`	`!(amend && is_a_merge(head_sha1))) {`
`627`	`627`	`run_status(stdout, index_file, prefix, 0);`
`628`		`- unlink(commit_editmsg);`
`629`	`628`	`return 0;`
`630`	`629`	`}`
`631`	`630`