summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-08-16 15:14:27 +0200
committerJunio C Hamano <gitster@pobox.com>2016-08-16 12:03:26 -0700
commit9445b4921e3e996b2d38d58c594f95d63a72dcea (patch)
tree15b8c14ab706c02ff446b919248f255c40778fc8
parent867ad08a2610526edb5723804723d371136fc643 (diff)
downloadgit-9445b4921e3e996b2d38d58c594f95d63a72dcea.tar.gz
rev-parse: respect core.hooksPath in --git-pathab/hooks
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>
-rw-r--r--path.c2
-rw-r--r--run-command.c5
-rwxr-xr-xt/t1350-config-hooks-path.sh6
3 files changed, 9 insertions, 4 deletions
diff --git a/path.c b/path.c
index 969b494d72..ad81856d53 100644
--- a/path.c
+++ b/path.c
@@ -379,6 +379,8 @@ static void adjust_git_path(struct strbuf *buf, int git_dir_len)
get_index_file(), strlen(get_index_file()));
else if (git_db_env && dir_prefix(base, "objects"))
replace_dir(buf, git_dir_len + 7, get_object_directory());
+ else if (git_hooks_path && dir_prefix(base, "hooks"))
+ replace_dir(buf, git_dir_len + 5, git_hooks_path);
else if (git_common_dir_env)
update_common_dir(buf, git_dir_len, NULL);
}
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;
diff --git a/t/t1350-config-hooks-path.sh b/t/t1350-config-hooks-path.sh
index 5e3fb3a6af..f1f9aee9f5 100755
--- a/t/t1350-config-hooks-path.sh
+++ b/t/t1350-config-hooks-path.sh
@@ -34,4 +34,10 @@ test_expect_success 'Check that various forms of specifying core.hooksPath work'
test_cmp expect actual
'
+test_expect_success 'git rev-parse --git-path hooks' '
+ git config core.hooksPath .git/custom-hooks &&
+ git rev-parse --git-path hooks/abc >actual &&
+ test .git/custom-hooks/abc = "$(cat actual)"
+'
+
test_done