ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-21 09:51:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes and improvements to handling of git repo with no tags on branch.

Browse Source
This commit is contained in:
gardners 2013-11-21 16:35:02 +10:30
parent e9e0a1b4a4
commit 22258b60c0
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
version_string.sh
View File

@ -115,14 +115,11 @@ if [ -n "$dirty" ] && ! $allow_modified; then
fi
# Use the "git describe" command to form the version string and append $dirty.
extragitflags=
set +e
error=`git describe --match="$version_tag_glob" 2>&1 1>/dev/null`
desc=`git describe --match="$version_tag_glob" 2>/dev/null`
set -e
# This ugly construction is required for use on machines with bash version 3.
error="$(git describe --match="$version_tag_glob" 2>&1 1>/dev/null)" || true
if [ "x$error" == "x" ]; then
echo $desc$dirty
if [ -z "$error" ]; then
echo "$(git describe --match="$version_tag_glob")"$dirty
exit 0
fi