kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2014-05-19 10:35:24 -07:00
parent c29bf4a556 b3f0c5c04e
commit 5714722f71
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-gui/git-gui.sh
View File

@ -1283,7 +1283,7 @@ load_config 0
apply_config apply_config


# v1.7.0 introduced --show-toplevel to return the canonical work-tree # 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] } { if { [is_Cygwin] } {
catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]} catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]}
} else { } else {
@ -1539,7 +1539,7 @@ proc rescan_stage2 {fd after} {
close $fd close $fd
} }


if {[package vsatisfies $::_git_version 1.6.3]} { if {[package vsatisfies $::_git_version 1.6.3-]} {
set ls_others [list --exclude-standard] set ls_others [list --exclude-standard]
} else { } else {
set ls_others [list --exclude-per-directory=.gitignore] set ls_others [list --exclude-per-directory=.gitignore]