From 9445b4921e3e996b2d38d58c594f95d63a72dcea Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 16 Aug 2016 15:14:27 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- run-command.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'run-command.c') diff --git a/run-command.c b/run-command.c index aa85cd5c3c..c72601056c 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; -- cgit v1.2.3