9445b4921e
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>
44 lines
1.1 KiB
Bash
Executable File
44 lines
1.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='Test the core.hooksPath configuration variable'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'set up a pre-commit hook in core.hooksPath' '
|
|
mkdir -p .git/custom-hooks .git/hooks &&
|
|
write_script .git/custom-hooks/pre-commit <<-\EOF &&
|
|
echo CUSTOM >>actual
|
|
EOF
|
|
write_script .git/hooks/pre-commit <<-\EOF
|
|
echo NORMAL >>actual
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'Check that various forms of specifying core.hooksPath work' '
|
|
test_commit no_custom_hook &&
|
|
git config core.hooksPath .git/custom-hooks &&
|
|
test_commit have_custom_hook &&
|
|
git config core.hooksPath .git/custom-hooks/ &&
|
|
test_commit have_custom_hook_trailing_slash &&
|
|
git config core.hooksPath "$PWD/.git/custom-hooks" &&
|
|
test_commit have_custom_hook_abs_path &&
|
|
git config core.hooksPath "$PWD/.git/custom-hooks/" &&
|
|
test_commit have_custom_hook_abs_path_trailing_slash &&
|
|
cat >expect <<-\EOF &&
|
|
NORMAL
|
|
CUSTOM
|
|
CUSTOM
|
|
CUSTOM
|
|
CUSTOM
|
|
EOF
|
|
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
|