Merge branch 'master'

* master:
GIT 1.2.0
Fix "test: unexpected operator" on bsd

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 72201be57c633259e65b435f8623a80e4cdc3e88..1056b7c817f8578348120f64ad7047754bf688df 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 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
 # (included in release tarballs), then default

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 157c7e4d6ce470191ca4207aaf1ecbf5cd4c7d75..025ef2d5f6b37d89dab1d602e1d8d1a80ab7f42e 100755 (executable)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -42,7 +42,7 @@ then
 
        # 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
-       if test $? == 128
+       if test $? = 128
        then
            exit
        fi