diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:26 -0700 |
| commit | afb497d472c22ba12c5b3313b6fdad132025468e (patch) | |
| tree | 5451adb8378dd949795e96fe898463a06aadcf90 /builtin | |
| parent | 43c1b6efb86bc68220d28c90b9f6f2d9e278d390 (diff) | |
| parent | 2140b14064ffe6b12ba6818b2894d1461a943fb9 (diff) | |
| download | git-afb497d472c22ba12c5b3313b6fdad132025468e.tar.gz git-afb497d472c22ba12c5b3313b6fdad132025468e.tar.xz | |
Merge branch 'jn/maint-commit-missing-template' into maint
* jn/maint-commit-missing-template:
commit: error out for missing commit message template
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 355b2cbca..d71e1e0c9 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -634,7 +634,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"; |