summaryrefslogtreecommitdiff
path: root/git-gui/git-gui.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-13 05:12:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-11-13 05:12:41 (GMT)
commit0f639abb68b29f6d4cd9b89ecfb66e41136dcfa3 (patch)
treec465f578f933c32dcbd1d8121665be64d6518c23 /git-gui/git-gui.sh
parent171d7661eda111d3e35f6e8097a1a3a07b30026c (diff)
parentf75c8b319f5b448d8e7dc589ca581eec852a131e (diff)
downloadgit-0f639abb68b29f6d4cd9b89ecfb66e41136dcfa3.zip
git-0f639abb68b29f6d4cd9b89ecfb66e41136dcfa3.tar.gz
git-0f639abb68b29f6d4cd9b89ecfb66e41136dcfa3.tar.bz2
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: Request blame metadata in utf-8. git-gui: Add the Show SSH Key item to the clone dialog. git-gui: Fix focus transition in the blame viewer.
Diffstat (limited to 'git-gui/git-gui.sh')
-rwxr-xr-xgit-gui/git-gui.sh20
1 files changed, 11 insertions, 9 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 12b496b..cf9ef6e 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -999,6 +999,17 @@ citool {
######################################################################
##
+## execution environment
+
+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]
+}
+
+######################################################################
+##
## repository setup
set picked 0
@@ -1073,15 +1084,6 @@ set selected_commit_type new
set nullid "0000000000000000000000000000000000000000"
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