summaryrefslogtreecommitdiff
path: root/GIT-VERSION-GEN
diff options
context:
space:
mode:
authorUwe Zeisberger <Uwe_Zeisberger@digi.com>2006-01-26 16:39:27 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-27 02:14:02 (GMT)
commit374dfaa2e39d04a4f1f63d1cb8d322d9db07c73a (patch)
tree5eb2cec42c5ebe392f7b8106f99bbb24728d0da5 /GIT-VERSION-GEN
parente974c9ab03c3c149bfc7da663167c6e59a7659f7 (diff)
downloadgit-374dfaa2e39d04a4f1f63d1cb8d322d9db07c73a.zip
git-374dfaa2e39d04a4f1f63d1cb8d322d9db07c73a.tar.gz
git-374dfaa2e39d04a4f1f63d1cb8d322d9db07c73a.tar.bz2
Make GIT-VERSION-GEN tolerate missing git describe command again
Commit 5c7d3c95 broke that by making the git-describe command part of a pipe. Signed-off-by: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'GIT-VERSION-GEN')
-rwxr-xr-xGIT-VERSION-GEN8
1 files changed, 5 insertions, 3 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index e3cd9fa..72201be 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -5,9 +5,11 @@ DEF_VER=v1.1.GIT
# First try git-describe, then see if there is a version file
# (included in release tarballs), then default
-VN=$(git-describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g') ||
-VN=$(cat version) ||
-VN="$DEF_VER"
+if VN=$(git-describe --abbrev=4 HEAD 2>/dev/null); then
+ VN=$(echo "$VN" | sed -e 's/-/./g');
+else
+ VN=$(cat version) || VN="$DEF_VER"
+fi
VN=$(expr "$VN" : v*'\(.*\)')