From: Junio C Hamano <junkio@cox.net>
Date: Sun, 12 Feb 2006 21:15:12 +0000 (-0800)
Subject: Merge branch 'master'
X-Git-Tag: v1.3.0-rc1~54^2~79
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=e76d1bec04d342d84686ad9c5fd47f048fd94609;hp=eafaa043cd3fc65cfaaa9adb5cf42524790c3a4a;p=git.git

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 72201be5..1056b7c8 100755
--- 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 157c7e4d..025ef2d5 100755
--- 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