Merge branch 'mr/hpux' into maint

diff --git a/builtin/commit.c b/builtin/commit.c
index 355b2cbca7460d40b013380c38801686e61b74f1..d71e1e0c9c27c4d03cd02b4deaacec67af33917a 100644 (file)
--- 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";