From: Junio C Hamano <gitster@pobox•com>
To: "Kyle J. McKay" <mackyle@gmail•com>
Cc: Jens Lehmann <Jens.Lehmann@web•de>,
Git mailing list <git@vger•kernel.org>,
Pat Thoyts <patthoyts@users•sourceforge.net>
Subject: Re: [PATCH] git-gui.sh: support Tcl 8.4
Date: Tue, 06 Jan 2015 16:02:25 -0800 [thread overview]
Message-ID: <xmqqk30zmp9q.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <82A625FF-768E-4D7E-8248-B14005464EAE@gmail.com> (Kyle J. McKay's message of "Tue, 6 Jan 2015 14:47:32 -0800")
^"Kyle J. McKay" <mackyle@gmail•com> writes:
> greater. But Jens mentions this in $gmane/249491 (that the original
> patch was missing the ">= 0" part).
Ah, that is what I missed. Thanks.
> I can't find anything in that thread about why vsatisfies was
> preferred over vcompare other than the obvious that the vsatisfies
> version is only a 1-character change. And that would be more than
> enough except that Tcl 8.4 doesn't support the trailing '-' vsatisfies
> syntax.
Yeah, I fully agree with that observation.
>> * Would it be a good idea to update the places $gmane/248895 points
>> out? It is clearly outside the scope of this fix, but we may
>> want to do so while our mind is on the "how do we check required
>> version?" in a separate patch.
>
> Makes sense to me, but my Tcl knowledge isn't up to making those
> changes as the code's a bit different. I have to paraphrase Chris's
> message here by saying that I guess those checks are correct if not
> consistent with the others.
OK, let's ask Pat (cc'ed) to apply your version as-is without
touching these 1.5.3 references. I do not take patches to git-gui
directly to my tree.
Thanks.
-- >8 --
From: "Kyle J. McKay" <mackyle@gmail•com>
Date: Tue, 6 Jan 2015 02:41:21 -0800
Tcl 8.5 introduced an extended vsatisfies syntax that is not
supported by Tcl 8.4.
Since only Tcl 8.4 is required this presents a problem.
The extended syntax was used starting with Git 2.0.0 in commit
b3f0c5c0 (git-gui: tolerate major version changes when comparing the
git version, 2014-05-17), so that a major version change would still
satisfy the condition.
However, what we really want is just a basic version compare, so use
vcompare instead to restore compatibility with Tcl 8.4.
Signed-off-by: Kyle J. McKay <mackyle@gmail•com>
Signed-off-by: Junio C Hamano <gitster@pobox•com>
---
git-gui.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-gui.sh b/git-gui.sh
index b186329d..a1a23b56 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -1283,7 +1283,7 @@ load_config 0
apply_config
# v1.7.0 introduced --show-toplevel to return the canonical work-tree
-if {[package vsatisfies $_git_version 1.7.0-]} {
+if {[package vcompare $_git_version 1.7.0] >= 0} {
if { [is_Cygwin] } {
catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]}
} else {
@@ -1539,7 +1539,7 @@ proc rescan_stage2 {fd after} {
close $fd
}
- if {[package vsatisfies $::_git_version 1.6.3-]} {
+ if {[package vcompare $::_git_version 1.6.3] >= 0} {
set ls_others [list --exclude-standard]
} else {
set ls_others [list --exclude-per-directory=.gitignore]
--
2.1.4
next prev parent reply other threads:[~2015-01-07 0:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-06 10:41 [PATCH] git-gui.sh: support Tcl 8.4 Kyle J. McKay
2015-01-06 19:42 ` Junio C Hamano
2015-01-06 22:47 ` Kyle J. McKay
2015-01-07 0:02 ` Junio C Hamano [this message]
2015-01-07 7:35 ` Jens Lehmann
2015-01-13 1:12 ` Pat Thoyts
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=xmqqk30zmp9q.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Jens.Lehmann@web$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=mackyle@gmail$(echo .)com \
--cc=patthoyts@users$(echo .)sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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