From: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Date: Thu, 31 Jul 2025 08:06:28 +0000 (-0700)
Subject: git-gui: ensure own version of git-gui--askpass is used
X-Git-Tag: v2.51.0-rc1~9^2^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e3efff4463c09f0070777000624f6b148873a0b5;p=thirdparty%2Fgit.git

git-gui: ensure own version of git-gui--askpass is used

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.

[j6t: move directory to variable to help in-flight topics]

Suggested-by: Mark Levedahl <mlevedahl@gmail.com>
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---

diff --git a/git-gui.sh b/git-gui.sh
index 8bb121db4f..f28a23f844 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1113,9 +1113,11 @@ citool {
 ## execution environment
 
 # Suggest our implementation of askpass, if none is set
+set argv0dir [file dirname [file normalize $::argv0]]
 if {![info exists env(SSH_ASKPASS)]} {
-	set env(SSH_ASKPASS) [file join [git --exec-path] git-gui--askpass]
+	set env(SSH_ASKPASS) [file join $argv0dir git-gui--askpass]
 }
+unset argv0dir
 
 ######################################################################
 ##