From: John Ellson <ellson@research.att.com>
Date: Fri, 30 Dec 2005 16:23:17 +0000 (-0500)
Subject: Make GIT-VERSION-GEN tolerate missing git describe command
X-Git-Tag: v1.1.0~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=026351a03507dc3a2e89e068c01234dc55914df2;p=git.git

Make GIT-VERSION-GEN tolerate missing git describe command

I think it is probably a bug that "git non_existent_command"
returns its error message to stdout without an error, where
"git-non_existent_command" behaves differently and does return an
error.

Older versions of git did not implement "git describe"  and
GIT-VERSION-GEN produces an empty version string if run on
a system with such a git installed.  The consequence
is that "make rpm" fails.

This patch fixes GIT-VERSION-GEN so that it works in the
absence of a working "git describe"

Signed-off-by: John Ellson <ellson@research.att.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 196402ce6..845b9dce6 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -2,7 +2,7 @@
 
 GVF=GIT-VERSION-FILE
 
-VN=$(git describe --abbrev=4 HEAD 2>/dev/null) || VN=v1.0.GIT
+VN=$(git-describe --abbrev=4 HEAD 2>/dev/null) || VN=v1.0.GIT
 VN=$(expr "$VN" : v'\(.*\)')
 if test -r $GVF
 then