Skip to content

Commit ce3e848

Browse files
mackylepatthoyts
authored andcommitted
git-gui: reinstate support for Tcl 8.4
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 b3f0c5c (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]> Signed-off-by: Pat Thoyts <[email protected]>
1 parent a117fa2 commit ce3e848

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git-gui.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,7 +1286,7 @@ load_config 0
12861286
apply_config
12871287
12881288
# v1.7.0 introduced --show-toplevel to return the canonical work-tree
1289-
if {[package vsatisfies $_git_version 1.7.0-]} {
1289+
if {[package vcompare $_git_version 1.7.0] >= 0} {
12901290
if { [is_Cygwin] } {
12911291
catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]}
12921292
} else {
@@ -1542,7 +1542,7 @@ proc rescan_stage2 {fd after} {
15421542
close $fd
15431543
}
15441544
1545-
if {[package vsatisfies $::_git_version 1.6.3-]} {
1545+
if {[package vcompare $::_git_version 1.6.3] >= 0} {
15461546
set ls_others [list --exclude-standard]
15471547
} else {
15481548
set ls_others [list --exclude-per-directory=.gitignore]

0 commit comments

Comments
 (0)