From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 May 2014 17:35:24 +0000 (-0700)
Subject: Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
X-Git-Tag: v2.0.0-rc4~6
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/5714722f71ea2eff99ba76fd7b04f61ba0142ea4?hp=c29bf4a5567fedf33aade51637b84d05e3392a71

Merge branch 'jl/use-vsatisfy-correctly-for-2.0'

* jl/use-vsatisfy-correctly-for-2.0:
git-gui: tolerate major version changes when comparing the git version
---

diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index cf2209b4f2..6a8907e7b3 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 vsatisfies $_git_version 1.7.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 vsatisfies $::_git_version 1.6.3-]} {
 		set ls_others [list --exclude-standard]
 	} else {
 		set ls_others [list --exclude-per-directory=.gitignore]