From: Anders Kaseorg Date: Fri, 07 Jan 2011 00:42:33 GMT Subject: [PATCH] gitk: Take only numeric version components when computing $git_version Message-ID: <1294360953.21006.2.camel@fixed-disk> In-Reply-To: <4D231646.5080005@debugon.org> This fixes errors running with release candidate versions of Git: Error in startup script: expected version number but got "1.7.4-rc0" Also, $git_version is no longer artificially limited to three components. That limitation was added by commit 194bbf6cc8c2f3c14a920c841841d66b7667a848 to deal with msysGit version strings like “1.6.4.msysgit.0”, and we don’t need it now. Hence as another side effect, this enables showing notes with git version 1.6.6.2 or 1.6.6.3, as originally intended by commit 7defefb134270b6e8ab3e422b343b41a4a383f5d. Signed-off-by: Anders Kaseorg --- gitk-git/gitk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gitk-git/gitk b/gitk-git/gitk index e82c6bf..9cbc09d 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -11581,7 +11581,7 @@ if {![info exists have_ttk]} { set use_ttk [expr {$have_ttk && $want_ttk}] set NS [expr {$use_ttk ? "ttk" : ""}] -set git_version [join [lrange [split [lindex [exec git version] end] .] 0 2] .] +regexp {^git version ([\d.]*\d)} [exec git version] _ git_version set show_notes {} if {[package vcompare $git_version "1.6.6.2"] >= 0} { -- 1.7.4-rc0