summaryrefslogtreecommitdiff
path: root/lib/mergetool.tcl
diff options
context:
space:
mode:
authorLibravatar Alexander Gavrilov <angavrilov@gmail.com>2008-10-15 13:28:21 +0400
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2008-11-01 16:01:34 -0700
commit8c76212529570aed70c46d6f252cb1a4010f3f2e (patch)
treee5be1df71c65fefd05640bc99c22f2b6768900ae /lib/mergetool.tcl
parentgit-gui: Add a dialog that shows the OpenSSH public key. (diff)
downloadtgif-8c76212529570aed70c46d6f252cb1a4010f3f2e.tar.xz
git-gui: Add a simple implementation of SSH_ASKPASS.
OpenSSH allows specifying an external program to use for direct user interaction. While most Linux systems already have such programs, some environments, for instance, msysgit, lack it. This patch adds a simple fallback Tcl implementation of the tool. In msysgit it is also necessary to set a fake value of the DISPLAY variable, because otherwise ssh won't even try to use SSH_ASKPASS handlers. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Acked-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'lib/mergetool.tcl')
0 files changed, 0 insertions, 0 deletions