Skip to content

Commit 8c45a38

Browse files
committed
Merge branch 'git-gui-hooks-path' of https://github.com/dscho/git-gui
Let's try to address git-for-windows#1755 this way. Signed-off-by: Johannes Schindelin <[email protected]>
2 parents d3fbd2a + b178a81 commit 8c45a38

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

git-gui/git-gui.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,11 @@ proc git_write {args} {
623623
}
624624
625625
proc githook_read {hook_name args} {
626-
set pchook [gitdir hooks $hook_name]
626+
if {[package vcompare $::_git_version 2.5.0] >= 0} {
627+
set pchook [git rev-parse --git-path "hooks/$hook_name"]
628+
} else {
629+
set pchook [gitdir hooks $hook_name]
630+
}
627631
lappend args 2>@1
628632
629633
# On Windows [file executable] might lie so we need to ask

0 commit comments

Comments
 (0)