summaryrefslogtreecommitdiff
path: root/run-command.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-08-16 13:14:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-16 19:03:26 (GMT)
commit9445b4921e3e996b2d38d58c594f95d63a72dcea (patch)
tree15b8c14ab706c02ff446b919248f255c40778fc8 /run-command.c
parent867ad08a2610526edb5723804723d371136fc643 (diff)
downloadgit-9445b4921e3e996b2d38d58c594f95d63a72dcea.zip
git-9445b4921e3e996b2d38d58c594f95d63a72dcea.tar.gz
git-9445b4921e3e996b2d38d58c594f95d63a72dcea.tar.bz2
rev-parse: respect core.hooksPath in --git-path
The idea of the --git-path option is not only to avoid having to prefix paths with the output of --git-dir all the time, but also to respect overrides for specific common paths inside the .git directory (e.g. `git rev-parse --git-path objects` will report the value of the environment variable GIT_OBJECT_DIRECTORY, if set). When introducing the core.hooksPath setting, we forgot to adjust git_path() accordingly. This patch fixes that. While at it, revert the special-casing of core.hooksPath in run-command.c, as it is now no longer needed. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'run-command.c')
-rw-r--r--run-command.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/run-command.c b/run-command.c
index aa85cd5..c726010 100644
--- a/run-command.c
+++ b/run-command.c
@@ -815,10 +815,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;