From: Junio C Hamano <junkio@cox.net>
Date: Thu, 2 Mar 2006 22:38:44 +0000 (-0800)
Subject: GIT-VERSION-GEN: squelch unneeded error from "cat version"
X-Git-Tag: v1.3.0-rc1~89
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0b8b051cd50cb423476ab7a8aa5853dc601b721d;p=git.git

GIT-VERSION-GEN: squelch unneeded error from "cat version"

Now this is really a corner case, but if you have the git source
tree from somewhere other than the official tarball, you do not
have version file.  And if git-describe does not work for you
(maybe you do not have git yet), we spilled an error message
from "cat version".

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 1056b7c81..d6d1ae033 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -7,8 +7,11 @@ DEF_VER=v1.2.GIT
 # (included in release tarballs), then default
 if VN=$(git-describe --abbrev=4 HEAD 2>/dev/null); then
 	VN=$(echo "$VN" | sed -e 's/-/./g');
-else
+elif test -f version
+then
 	VN=$(cat version) || VN="$DEF_VER"
+else
+	VN="$DEF_VER"
 fi
 
 VN=$(expr "$VN" : v*'\(.*\)')