Use the higher tag when there are more than one

If two or more tags of the right format point point to
HEAD, we probably want the later of the two.
This commit is contained in:
Bruno Wolff III 2013-08-20 21:44:29 -05:00
parent 11631d6481
commit 2be322d626

View File

@ -1,5 +1,5 @@
# Get the version name first by seeing if HEAD is tagged # Get the version name first by seeing if HEAD is tagged
version := $(shell git tag --points-at HEAD -l '0.*.*' | head -1) version := $(shell git tag --points-at HEAD -l '0.*.*' | sort -r | head -1)
# And if it wasn't use a git hash # And if it wasn't use a git hash
ifeq ($(version),) ifeq ($(version),)
version := $(shell git log -1 --abbrev=8 --pretty=git%h) version := $(shell git log -1 --abbrev=8 --pretty=git%h)