Merge pull request #1757 from dscho/git-gui-hooks-path

git-gui: respect modern hooks paths
git-for-windows · Jul 11, 2018 · 27a24fd · 27a24fd
2 parents 83af493 + 0a6f41b
commit 27a24fd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/git-gui/git-gui.sh b/git-gui/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