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>
Johannes Schindelin committed
Aug 16, 2016 at 15:14 UTC
9445b4921e3e996b2d38d58c594f95d63a72dcea
3 files changed
+9
-4
path.c
+2
@@ -379,6 +379,8 @@ static void adjust_git_path(struct strbuf *buf, int git_dir_len)
379
get_index_file(), strlen(get_index_file()));
380
else if (git_db_env && dir_prefix(base, "objects"))
381
replace_dir(buf, git_dir_len + 7, get_object_directory());
382
+ else if (git_hooks_path && dir_prefix(base, "hooks"))
383
+ replace_dir(buf, git_dir_len + 5, git_hooks_path);
384
else if (git_common_dir_env)
385
update_common_dir(buf, git_dir_len, NULL);
386
}
run-command.c
+1
-4
@@ -815,10 +815,7 @@ const char *find_hook(const char *name)
815
static struct strbuf path = STRBUF_INIT;
816
817
strbuf_reset(&path);
818
- if (git_hooks_path)
819
- strbuf_addf(&path, "%s/%s", git_hooks_path, name);
820
- else
821
- strbuf_git_path(&path, "hooks/%s", name);
818
+ strbuf_git_path(&path, "hooks/%s", name);
819
if (access(path.buf, X_OK) < 0)
820
return NULL;
821
return path.buf;
t/t1350-config-hooks-path.sh
+6
@@ -34,4 +34,10 @@ test_expect_success 'Check that various forms of specifying core.hooksPath work'
34
test_cmp expect actual
35
'
36
37
+test_expect_success 'git rev-parse --git-path hooks' '
38
+ git config core.hooksPath .git/custom-hooks &&
39
+ git rev-parse --git-path hooks/abc >actual &&
40
+ test .git/custom-hooks/abc = "$(cat actual)"
41
+'
42
+
43
test_done