Skip to content

Commit

Permalink
gitk: Handle msysGit version during version comparisons
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pat Thoyts authored and Paul Mackerras committed May 18, 2009
1 parent 13d40b6 commit 194bbf6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion gitk
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down

0 comments on commit 194bbf6

Please sign in to comment.