aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-02-25 03:07:57 -0600
committerJunio C Hamano <gitster@pobox.com>2011-02-25 12:13:55 -0800
commit2140b14064ffe6b12ba6818b2894d1461a943fb9 (patch)
tree5686a2f43ce2edcfed88b706346733da8bbc4691 /builtin
parentda656f17d37fe96454645c08f21a24134f5aa900 (diff)
downloadgit-2140b14064ffe6b12ba6818b2894d1461a943fb9.tar.gz
git-2140b14064ffe6b12ba6818b2894d1461a943fb9.tar.xz
commit: error out for missing commit message template
When "git commit" was rewritten in C (v1.5.4-rc0~78^2~30, 2007-11-08), a subtle bug in --template was introduced. If the file named by a --template parameter is missing, previously git would error out with a message: Commit template file does not exist. but in the C version the --template parameter gets ignored and the default template is used. t7500 has two tests for this case which would have caught it, except that with the default $EDITOR, the commit message template is left unmodified, causing 'git commit' to error out and the test to succeed. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/commit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index 6e2f12acc..cc16e3f29 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -602,7 +602,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
if (strbuf_read_file(&sb, git_path("SQUASH_MSG"), 0) < 0)
die_errno("could not read SQUASH_MSG");
hook_arg1 = "squash";
- } else if (template_file && !stat(template_file, &statbuf)) {
+ } else if (template_file) {
if (strbuf_read_file(&sb, template_file, 0) < 0)
die_errno("could not read '%s'", template_file);
hook_arg1 = "template";