From: Uwe Zeisberger <Uwe_Zeisberger@digi.com>
Date: Thu, 26 Jan 2006 16:39:27 +0000 (+0100)
Subject: Make GIT-VERSION-GEN tolerate missing git describe command again
X-Git-Tag: v1.2.0~104
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=374dfaa2e39d04a4f1f63d1cb8d322d9db07c73a;p=git.git

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>
---

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*'\(.*\)')