Skip to content

Commit dae38fd

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 c35f607 + 551e7c3 commit dae38fd

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
@@ -664,7 +664,11 @@ proc git_write {args} {
664664
}
665665

666666
proc githook_read {hook_name args} {
667-
set pchook [gitdir hooks $hook_name]
667+
if {[package vcompare $::_git_version 2.5.0] >= 0} {
668+
set pchook [git rev-parse --git-path "hooks/$hook_name"]
669+
} else {
670+
set pchook [gitdir hooks $hook_name]
671+
}
668672
lappend args 2>@1
669673

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

0 commit comments

Comments
 (0)