From 374dfaa2e39d04a4f1f63d1cb8d322d9db07c73a Mon Sep 17 00:00:00 2001 From: Uwe Zeisberger Date: Thu, 26 Jan 2006 17:39:27 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- GIT-VERSION-GEN | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index e3cd9fa0..72201be5 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*'\(.*\)') -- 2.11.0