From 3ea33c9fa72ae0dcdf04e6d0fc2872aae28cdc68 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Tue, 18 Dec 2018 12:03:23 +0000
Subject: [PATCH] Fix build tags maybe?

---
 contrib/semver/version.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/contrib/semver/version.sh b/contrib/semver/version.sh
index a17cf6f..2b3c4bc 100644
--- a/contrib/semver/version.sh
+++ b/contrib/semver/version.sh
@@ -33,9 +33,6 @@ if [ $? != 0 ]; then
   exit 1
 fi
 
-# Get the number of merges on the current branch since the last tag
-BUILD=$(git rev-list $TAG..HEAD --count --merges)
-
 # Split out into major, minor and patch numbers
 MAJOR=$(echo $TAG | cut -c 2- | cut -d "." -f 1)
 MINOR=$(echo $TAG | cut -c 2- | cut -d "." -f 2)
@@ -54,6 +51,10 @@ else
   printf '%s%d.%d.%d' "$PREPEND" "$MAJOR" "$MINOR" "$PATCH"
 fi
 
+# Get the number of merges on the current branch since the last tag
+TAG=$(git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.[0-9]*" 2>/dev/null)
+BUILD=$(git rev-list $TAG..$BRANCH --count)
+
 # Add the build tag on non-master branches
 if [ $BRANCH != "master" ]; then
   if [ $BUILD != 0 ]; then