From 0b8b051cd50cb423476ab7a8aa5853dc601b721d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 2 Mar 2006 14:38:44 -0800 Subject: [PATCH] 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 --- GIT-VERSION-GEN | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 1056b7c8..d6d1ae03 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*'\(.*\)') -- 2.11.0