aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Beyer <s-beyer@gmx.net>2009-01-16 20:40:05 +0100
committerJunio C Hamano <gitster@pobox.com>2009-01-17 17:57:35 -0800
commit2454ac7b9fbc12db5cca8cd388422360528d7d6f (patch)
tree85b65d153850285ea602476de027f8dc4f7aabc2
parentf8aa1b6902d7a77c26b0ef615c9070bbed4be5c4 (diff)
downloadgit-2454ac7b9fbc12db5cca8cd388422360528d7d6f.tar.gz
git-2454ac7b9fbc12db5cca8cd388422360528d7d6f.tar.xz
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 f5bbc3225c4b07 "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>
-rw-r--r--builtin-commit.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c
index 1e0839991..6cbdd55f1 100644
--- 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;
}