summaryrefslogtreecommitdiff
path: root/git-gui.sh
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2025-08-04 18:27:03 +0200
committerJohannes Sixt <j6t@kdbg.org>2025-08-04 18:27:03 +0200
commite3923e3e90da55e12545b5ef5aa34f21e97409d8 (patch)
tree9f44a7c27ed845e2162e5f26c04f5f278251e90d /git-gui.sh
parent14ff7c8956ef64831bcf8591c58b046deb458a29 (diff)
parente3efff4463c09f0070777000624f6b148873a0b5 (diff)
Merge branch 'cb/no-tcl86-on-macos'
* cb/no-tcl86-on-macos: git-gui: ensure own version of git-gui--askpass is used git-gui: honor TCLTK_PATH in git-gui--askpass git-gui: retire Git Gui.app git-gui: fix dependency of GITGUI_MAIN on generator git-gui: remove uname_O in Makefile
Diffstat (limited to 'git-gui.sh')
-rwxr-xr-xgit-gui.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-gui.sh b/git-gui.sh
index a42e1ce152..a931d7f7c9 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1126,9 +1126,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
######################################################################
##