Skip to content

Commit 1afde55

Browse files
committed
Merge branch 'git-gui-hooks-path' of https://github.com/dscho/git-gui
Let's try to address #1755 this way. Signed-off-by: Johannes Schindelin <[email protected]>
2 parents be55c1e + 0e44016 commit 1afde55

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
@@ -685,7 +685,11 @@ proc git_write {args} {
685685
}
686686

687687
proc githook_read {hook_name args} {
688-
set pchook [gitdir hooks $hook_name]
688+
if {[package vcompare $::_git_version 2.5.0] >= 0} {
689+
set pchook [git rev-parse --git-path "hooks/$hook_name"]
690+
} else {
691+
set pchook [gitdir hooks $hook_name]
692+
}
689693
lappend args 2>@1
690694

691695
# On Windows [file executable] might lie so we need to ask

0 commit comments

Comments
 (0)