gitk: Take only numeric version components when computing $git_version

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 194bbf6cc8c2 ("gitk: Handle msysGit version during version comparisons") 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 7defefb13427 ("gitk: Show notes by default (like git log does"). Signed-off-by: Anders Kaseorg <andersk@mit.edu> Reported-by: Mathias Lafeldt <misfire@debugon.org> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>

Anders Kaseorg committed Jan 6, 2011 at 17:42 UTC 7add5aff869746ced2b506801176561d4b80e427

1 file changed +1 -1

gitk

+1 -1

@@ -11581,7 +11581,7 @@ if {![info exists have_ttk]} {

11581 set use_ttk [expr {$have_ttk && $want_ttk}]

11582 set NS [expr {$use_ttk ? "ttk" : ""}]

11583

11584 -set git_version [join [lrange [split [lindex [exec git version] end] .] 0 2] .]

11584 +regexp {^git version ([\d.]*\d)} [exec git version] _ git_version

11585

11586 set show_notes {}

11587 if {[package vcompare $git_version "1.6.6.2"] >= 0} {