提交 7add5aff 编写于 作者: A Anders Kaseorg 提交者: Paul Mackerras

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 194bbf6c
("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
7defefb1 ("gitk: Show notes by default (like git log does").
Signed-off-by: NAnders Kaseorg <andersk@mit.edu>
Reported-by: NMathias Lafeldt <misfire@debugon.org>
Reviewed-by: NJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
上级 6758ad94
......@@ -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} {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册