summaryrefslogtreecommitdiff
path: root/gitk
diff options
context:
space:
mode:
authorLibravatar Pat Thoyts <patthoyts@users.sourceforge.net>2009-05-18 22:46:01 +0100
committerLibravatar Paul Mackerras <paulus@samba.org>2009-05-19 08:57:29 +1000
commit194bbf6cc8c2f3c14a920c841841d66b7667a848 (patch)
tree1036a0b409ff4fdc2f92ed0aa59d5f46c428631e /gitk
parentgitk: Make more options easily accessible from Edit View dialog (diff)
downloadtgif-194bbf6cc8c2f3c14a920c841841d66b7667a848.tar.xz
gitk: Handle msysGit version during version comparisons
msysGit generates version strings with text appended which cannot be used with vcompare; trying to use them generates a Tcl error. Limit git_version to the first three digits which are the real git version to avoid this error. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'gitk')
-rwxr-xr-xgitk2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitk b/gitk
index 0804e6e36e..18553904f8 100755
--- a/gitk
+++ b/gitk
@@ -11152,7 +11152,7 @@ set nullid2 "0000000000000000000000000000000000000001"
set nullfile "/dev/null"
set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
-set git_version [lindex [exec git version] end]
+set git_version [join [lrange [split [lindex [exec git version] end] .] 0 2] .]
set runq {}
set history {}