Merge branch 'master'
* master: GIT 1.2.0 Fix "test: unexpected operator" on bsd
This commit is contained in:
commit
e76d1bec04
@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
GVF=GIT-VERSION-FILE
|
GVF=GIT-VERSION-FILE
|
||||||
DEF_VER=v1.1.GIT
|
DEF_VER=v1.2.GIT
|
||||||
|
|
||||||
# First try git-describe, then see if there is a version file
|
# First try git-describe, then see if there is a version file
|
||||||
# (included in release tarballs), then default
|
# (included in release tarballs), then default
|
||||||
|
@ -42,7 +42,7 @@ then
|
|||||||
|
|
||||||
# Make sure we are in a valid repository of a vintage we understand.
|
# Make sure we are in a valid repository of a vintage we understand.
|
||||||
GIT_DIR="$GIT_DIR" git repo-config --get core.nosuch >/dev/null
|
GIT_DIR="$GIT_DIR" git repo-config --get core.nosuch >/dev/null
|
||||||
if test $? == 128
|
if test $? = 128
|
||||||
then
|
then
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user