diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2014-05-17 21:49:05 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-19 10:12:45 -0700 |
| commit | b3f0c5c04ed24d04a3403abf517bec439ebb40e2 (patch) | |
| tree | 1ddf2ec4b34a36a7762a12e6dba869313d04ce99 | |
| parent | 1b2c79e63e5afa3cecb3ab4a40cb414dbe6511ce (diff) | |
| download | git-b3f0c5c04ed24d04a3403abf517bec439ebb40e2.tar.gz | |
git-gui: tolerate major version changes when comparing the git versionjl/use-vsatisfy-correctly-for-2.0
Since git 2.0.0 starting git gui in a submodule using a gitfile fails with
the following error:
No working directory ../../../<path>
couldn't change working directory
to "../../../<path>": no such file or
directory
This is because "git rev-parse --show-toplevel" is only run when git gui
sees a git version of at least 1.7.0 (which is the version in which the
--show-toplevel option was introduced). But "package vsatisfies" returns
false when the major version changes, which is not what we want here.
Fix that for both places where the git version is checked using vsatisfies
by appending a '-' to the version number. This tells vsatisfies that a
change of the major version is not considered to be a problem, as long as
the new major version is larger. This is done for both the place that
caused the reported bug and another spot where the git version is tested
for another feature.
Reported-by: Chris Packham <judge.packham@gmail.com>
Reported-by: Yann Dirson <ydirson@free.fr>
Helped-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Tested-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-gui.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-gui.sh b/git-gui.sh index cf2209b4f2..6a8907e7b3 100755 --- a/git-gui.sh +++ b/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] |