Skip to content

Commit

Permalink
update_version: Drop --always from git describe
Browse files Browse the repository at this point in the history
The package_version file will be used if there are no tags, which
is better than just the hash that is returned by --always.
  • Loading branch information
mark4o committed Jan 22, 2017
1 parent 33a848f commit 5aecfed
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions update_version
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ fi
# -dirty from files that have been touched but are not actually altered in the
# working dir.
GIT_VERSION=$(cd "$SRCDIR" && git status > /dev/null 2>&1 \
&& git describe --tags --match 'v*' \
--always --dirty 2> /dev/null)
&& git describe --tags --match 'v*' --dirty 2> /dev/null)
GIT_VERSION=${GIT_VERSION#v}

if [ -n "$GIT_VERSION" ]; then
Expand Down

0 comments on commit 5aecfed

Please sign in to comment.