commit 0ecefe0230e2135e2a93939ae573f6e22ac97c46
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 29 22:08:06 2013 -0500
Fix to work with multiple tags
If there are multiple tags pointing to HEAD we need to pick only
one. We'll take one that seems to be a version number. This allows
the version number tag to coexist with another tag, that perhaps
indicates which images it was used to build.
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/Makefile b/Makefile
index f924b0c..b0c726a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
# Get the version name first by seeing if HEAD is tagged
-version := $(shell git tag --points-at HEAD)
+version := $(shell git tag --points-at HEAD -l '0.*.*' | head -1)
# And if it wasn't use a git hash
ifeq ($(version),)
version := $(shell git log -1 --abbrev=8 --pretty=git%h)
Show replies by date