undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitk: Take only numeric version components when computing $git_version

Browse Source 
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 194bbf6cc8
("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
7defefb134 ("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>
This commit is contained in:
Anders Kaseorg 2011-01-06 17:42:33 -07:00 committed by Paul Mackerras
parent 6758ad9440
commit 7add5aff86
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gitk
View File

@ -11581,7 +11581,7 @@ if {![info exists have_ttk]} {
set use_ttk [expr {$have_ttk && $want_ttk}] set use_ttk [expr {$have_ttk && $want_ttk}]
set NS [expr {$use_ttk ? "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 {} set show_notes {}
if {[package vcompare $git_version "1.6.6.2"] >= 0} { if {[package vcompare $git_version "1.6.6.2"] >= 0} {