Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maint

diff --git a/run-command.c b/run-command.c
index 33bc63a1de8d41b52a0ec353cf80b0f2e65dc8fd..5a4dbb66d7e4d4ed4bd6cf319f132c1b4d870572 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -824,10 +824,7 @@ const char *find_hook(const char *name)
        static struct strbuf path = STRBUF_INIT;
 
        strbuf_reset(&path);
-       if (git_hooks_path)
-               strbuf_addf(&path, "%s/%s", git_hooks_path, name);
-       else
-               strbuf_git_path(&path, "hooks/%s", name);
+       strbuf_git_path(&path, "hooks/%s", name);
        if (access(path.buf, X_OK) < 0)
                return NULL;
        return path.buf;