From: "Kyle J. McKay" <mackyle@gmail.com>
To: Jens Lehmann <Jens.Lehmann@web.de>
Cc: Git mailing list <git@vger.kernel.org>
Subject: [PATCH] git-gui.sh: support Tcl 8.4
Date: Tue, 6 Jan 2015 02:41:21 -0800 [thread overview]
Message-ID: <97e448e7908a1f959a7294e389553b5@74d39fa044aa309eaea14b9f57fe79c> (raw)
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 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
---
git-gui/git-gui.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-gui/git-gui.sh b/git-gui/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 reply other threads:[~2015-01-06 10:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-06 10:41 Kyle J. McKay [this message]
2015-01-06 19:42 ` [PATCH] git-gui.sh: support Tcl 8.4 Junio C Hamano
2015-01-06 22:47 ` Kyle J. McKay
2015-01-07 0:02 ` Junio C Hamano
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=97e448e7908a1f959a7294e389553b5@74d39fa044aa309eaea14b9f57fe79c \
--to=mackyle@gmail.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.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).