Skip to content

Commit 194bbf6

Browse files
patthoytspaulusmack
authored andcommitted
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 <[email protected]> Signed-off-by: Paul Mackerras <[email protected]>
1 parent 13d40b6 commit 194bbf6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

gitk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11152,7 +11152,7 @@ set nullid2 "0000000000000000000000000000000000000001"
1115211152
set nullfile "/dev/null"
1115311153

1115411154
set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
11155-
set git_version [lindex [exec git version] end]
11155+
set git_version [join [lrange [split [lindex [exec git version] end] .] 0 2] .]
1115611156

1115711157
set runq {}
1115811158
set history {}

0 commit comments

Comments
 (0)