diff options
Diffstat (limited to 'git-gui.sh')
| -rwxr-xr-x | git-gui.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh index e4d1f70f1c..12b496bec9 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -592,6 +592,11 @@ bind . <Visibility> { if {[is_Windows]} { wm iconbitmap . -default $oguilib/git-gui.ico set ::tk::AlwaysShowSelection 1 + + # Spoof an X11 display for SSH + if {![info exists env(DISPLAY)]} { + set env(DISPLAY) :9999 + } } ###################################################################### @@ -1071,6 +1076,13 @@ set nullid2 "0000000000000000000000000000000000000001" set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}] ###################################################################### + +# Suggest our implementation of askpass, if none is set +if {![info exists env(SSH_ASKPASS)]} { + set env(SSH_ASKPASS) [gitexec git-gui--askpass] +} + +###################################################################### ## ## task management |