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]>
git-for-windows · Nov 2, 2023 · 355b603 · 355b603
2 parents e69a5ea + beef75f
commit 355b603
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
@@ -685,7 +685,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