When finding a location for the askpass helper, git will be asked
for its exec path, but if that git is not the same that called
git-gui then we might mistakenly point to its helper instead.
Assume that git-gui and the helper are colocated to derive its
path instead.
This is specially useful in macOS where a broken version of that
helper is provided by the system git.
Suggested-by: Mark Levedahl <mlevedahl@xxxxxxxxx>
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@xxxxxxxxx>
---
git-gui.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/git-gui.sh b/git-gui.sh
index 8bb121d..78324db 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1114,7 +1114,9 @@ citool {
# Suggest our implementation of askpass, if none is set
if {![info exists env(SSH_ASKPASS)]} {
- set env(SSH_ASKPASS) [file join [git --exec-path] git-gui--askpass]
+ set env(SSH_ASKPASS) \
+ [file join [file dirname [file normalize $::argv0]] \
+ git-gui--askpass]
}
######################################################################
--
2.50.1.475.ge15fa7359c
