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
This commit is contained in:
@@ -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
|
||||
|
||||
######################################################################
|
||||
##
|
||||
|
||||
Reference in New Issue
Block a user