From: Johannes Schindelin <johannes.schinde...@gmx.de>

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 <phil...@gortan.org>
Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de>
---
 git-gui.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/git-gui.sh b/git-gui.sh
index fd476b6999..b2c6e7a1db 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -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
-- 
gitgitgadget

Reply via email to