From: Mathias Lafeldt <misfire@debugon.org>
To: Anders Kaseorg <andersk@MIT.EDU>
Cc: Paul Mackerras <paulus@samba.org>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: [PATCH] gitk: Take only numeric version components when computing $git_version
Date: Tue, 11 Jan 2011 14:46:38 +0100 [thread overview]
Message-ID: <4D2C5F3E.2020007@debugon.org> (raw)
In-Reply-To: <1294360953.21006.2.camel@fixed-disk>
Anders Kaseorg wrote:
> 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 <andersk@mit.edu>
> ---
> 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} {
Seems to work well.
However, an "Reported-by" would have been nice.
People don't seem to use gitk with the RC releases because nobody else
complains...
-Mathias
next prev parent reply other threads:[~2011-01-11 13:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-04 12:44 BUG: gitk fails to parse 1.7.4-rc0 version string Mathias Lafeldt
2011-01-07 0:42 ` [PATCH] gitk: Take only numeric version components when computing $git_version Anders Kaseorg
2011-01-11 13:46 ` Mathias Lafeldt [this message]
2011-01-13 19:22 ` Jonathan Nieder
2011-01-18 9:12 ` Mathias Lafeldt
2011-01-18 10:47 ` Paul Mackerras
2011-01-18 21:26 ` Junio C Hamano
2011-01-19 9:35 ` Paul Mackerras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D2C5F3E.2020007@debugon.org \
--to=misfire@debugon.org \
--cc=andersk@MIT.EDU \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).