Merge branch 'jk/long-error-messages'

diff --git a/run-command.c b/run-command.c
index 0d01671c1ff26ccfe04481713a4071c321d8ab11..3277cf797ed41e5834b3b94fa8d2e9e9d5b4a317 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -784,11 +784,13 @@ int finish_async(struct async *async)
 
 const char *find_hook(const char *name)
 {
-       const char *path = git_path("hooks/%s", name);
-       if (access(path, X_OK) < 0)
-               path = NULL;
+       static struct strbuf path = STRBUF_INIT;
 
-       return path;
+       strbuf_reset(&path);
+       strbuf_git_path(&path, "hooks/%s", name);
+       if (access(path.buf, X_OK) < 0)
+               return NULL;
+       return path.buf;
 }
 
 int run_hook_ve(const char *const *env, const char *name, va_list args)