Don't put g next to 7 char commit has in version.

Hard to select sha in 1.3.1-292-ga5a9473-dirty so
1.3.1-292-git-a5a9473-dirty  is easier

Fixes: #578
This commit is contained in:
Dave Davenport 2017-03-21 08:37:07 +01:00
parent a5a9473046
commit f0775b2918
1 changed files with 3 additions and 2 deletions

View File

@ -7,8 +7,9 @@ GIT=$(which git)
if [ -d "${DIR}/.git/" ] && [ -n "${GIT}" ]
then
echo -n "#define GIT_VERSION \"" > ${FILE}.tmp
REV="$(${GIT} describe --tags --always --dirty) ($(${GIT} describe --tags --always --all | sed -e 's:heads/::'))"
echo -n "${REV}" >> ${FILE}.tmp
BRTG="$(${GIT} describe --tags --always --all | sed -e 's:heads/::')"
REV="$(${GIT} describe --tags --always --dirty| sed -e 's:-g\([a-f0-9]\{7\}\):-git-\1:g')"
echo -n "${REV} (${BRTG})" >> ${FILE}.tmp
echo "\"" >> ${FILE}.tmp
else
echo "#undef GIT_VERSION" > ${FILE}.tmp