respect core.hooksPath, falling back to .git/hooks

Since v2.9.0, Git knows about the config variable core.hookspath
that allows overriding the path to the directory containing the
Git hooks.

Since v2.10.0, the `--git-path` option respects that config
variable, too, so we may just as well use that command.

For Git versions older than v2.5.0 (which was the first version to
support the `--git-path` option for the `rev-parse` command), we
simply fall back to the previous code.

This fixes https://github.com/git-for-windows/git/issues/1755

Initial-patch-by: Philipp Gortan <philipp@gortan.org>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2018-10-04 14:46:00 +02:00
parent 0d438c7f4e
commit 1f5ccb039b

View File

@@ -623,7 +623,11 @@ proc git_write {args} {
}
proc githook_read {hook_name args} {
set pchook [gitdir hooks $hook_name]
if {[package vcompare $::_git_version 2.5.0] >= 0} {
set pchook [git rev-parse --git-path "hooks/$hook_name"]
} else {
set pchook [gitdir hooks $hook_name]
}
lappend args 2>@1
# On Windows [file executable] might lie so we need to ask