diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-02-25 09:07:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-25 20:13:55 (GMT) |
| commit | 2140b14064ffe6b12ba6818b2894d1461a943fb9 (patch) | |
| tree | 5686a2f43ce2edcfed88b706346733da8bbc4691 | |
| parent | da656f17d37fe96454645c08f21a24134f5aa900 (diff) | |
| download | git-2140b14064ffe6b12ba6818b2894d1461a943fb9.zip git-2140b14064ffe6b12ba6818b2894d1461a943fb9.tar.gz git-2140b14064ffe6b12ba6818b2894d1461a943fb9.tar.bz2 | |
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>
| -rw-r--r-- | builtin/commit.c | 2 | ||||
| -rwxr-xr-x | t/t7500-commit.sh | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 6e2f12a..cc16e3f 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"; diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh index aa9c577..1590877 100755 --- a/t/t7500-commit.sh +++ b/t/t7500-commit.sh @@ -23,13 +23,21 @@ test_expect_success 'a basic commit in an empty tree should succeed' ' test_expect_success 'nonexistent template file should return error' ' echo changes >> foo && git add foo && - test_must_fail git commit --template "$PWD"/notexist + ( + GIT_EDITOR="echo hello >\"\$1\"" && + export GIT_EDITOR && + test_must_fail git commit --template "$PWD"/notexist + ) ' test_expect_success 'nonexistent template file in config should return error' ' git config commit.template "$PWD"/notexist && - test_must_fail git commit && - git config --unset commit.template + test_when_finished "git config --unset commit.template" && + ( + GIT_EDITOR="echo hello >\"\$1\"" && + export GIT_EDITOR && + test_must_fail git commit + ) ' # From now on we'll use a template file that exists. |