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>
This commit is contained in:
John Ellson 2005-12-30 11:23:17 -05:00 committed by Junio C Hamano
parent 5df466c507
commit 026351a035

View File

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