Skip to content

Commit 1b8930e

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 49a1987 + dcaa509 commit 1b8930e

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
@@ -682,7 +682,11 @@ proc git_write {args} {
682682
}
683683

684684
proc githook_read {hook_name args} {
685-
set pchook [gitdir hooks $hook_name]
685+
if {[package vcompare $::_git_version 2.5.0] >= 0} {
686+
set pchook [git rev-parse --git-path "hooks/$hook_name"]
687+
} else {
688+
set pchook [gitdir hooks $hook_name]
689+
}
686690
lappend args 2>@1
687691

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

0 commit comments

Comments
 (0)