diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-05-19 10:35:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-19 10:35:24 -0700 |
| commit | 5714722f71ea2eff99ba76fd7b04f61ba0142ea4 (patch) | |
| tree | 6c46031a234a53b16598ba8c03a06060e8478c4b | |
| parent | c29bf4a5567fedf33aade51637b84d05e3392a71 (diff) | |
| parent | b3f0c5c04ed24d04a3403abf517bec439ebb40e2 (diff) | |
| download | git-5714722f71ea2eff99ba76fd7b04f61ba0142ea4.tar.gz | |
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
| -rwxr-xr-x | git-gui/git-gui.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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] |