git-version-gen: Check first for new tag format
Tags starting with "v*" are old ones. We first want to check for the new
ones, otherwise the wrong tag is selected as the last one.
Change-Id: Ic39bed2fcf7e3ccb6a83e2999d29d129e07c1a84
diff --git a/git-version-gen b/git-version-gen
index 42cf3d2..2a9abb5 100755
--- a/git-version-gen
+++ b/git-version-gen
@@ -93,8 +93,8 @@
then
: # use $v
elif
- v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
- || git describe --abbrev=4 HEAD 2>/dev/null` \
+ v=`git describe --abbrev=4 HEAD 2>/dev/null \
+ || git describe --abbrev=4 --match='v*' HEAD 2>/dev/null` \
&& case $v in
[0-9]*) ;;
v[0-9]*) ;;