mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
builtin-commit.c: do not remove COMMIT_EDITMSG
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 f5bbc3225c
"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>
This commit is contained in:
parent
f8aa1b6902
commit
2454ac7b9f
|
@ -625,7 +625,6 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
|
||||||
if (!commitable && !in_merge && !allow_empty &&
|
if (!commitable && !in_merge && !allow_empty &&
|
||||||
!(amend && is_a_merge(head_sha1))) {
|
!(amend && is_a_merge(head_sha1))) {
|
||||||
run_status(stdout, index_file, prefix, 0);
|
run_status(stdout, index_file, prefix, 0);
|
||||||
unlink(commit_editmsg);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue