mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 20:14:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make GIT-VERSION-GEN tolerate missing git describe command again

Browse Source 
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>
This commit is contained in:
Uwe Zeisberger 2006-01-26 17:39:27 +01:00 committed by Junio C Hamano
parent e974c9ab03
commit 374dfaa2e3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
GIT-VERSION-GEN
View File

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