Merge pull request #1473

f1f0109 Fix version string by picking up unannotated tags (stoffu)
This commit is contained in:
luigi1111 2018-07-17 16:36:23 -05:00
commit b9fcd8f60b
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -54,7 +54,7 @@ function get_tag()
VERSIONTAG="$COMMIT" VERSIONTAG="$COMMIT"
fi fi
# save tag name + commit if availible # save tag name + commit if availible
TAGNAME=$(git describe | sed -e 's/[\t ]*//') TAGNAME=$(git describe --tags | sed -e 's/[\t ]*//')
if test -z "$TAGNAME" if test -z "$TAGNAME"
then then
TAGNAME="$VERSIONTAG" TAGNAME="$VERSIONTAG"