From 0ee74a4efd364c57af0756812d31c4f792924293 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Mon, 17 Dec 2018 10:34:26 +0000
Subject: [PATCH] Update semver

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

diff --git a/contrib/semver/version.sh b/contrib/semver/version.sh
index 331046f3..eab5ab86 100644
--- a/contrib/semver/version.sh
+++ b/contrib/semver/version.sh
@@ -3,7 +3,7 @@
 # Merge commits from this branch are counted
 DEVELOPBRANCH="yggdrasil-network/develop"
 
-# Get the last tag
+# Get the last tag that denotes moving to a major version number
 TAG=$(git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.0" 2>/dev/null)
 
 # Get last merge to master
@@ -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)
@@ -56,6 +53,10 @@ fi
 
 # Add the build tag on non-master branches
 if [ $BRANCH != "master" ]; then
+  # Get the number of merges on the current branch since the last tag
+  BUILDTAG=$(git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.[0-9]*" 2>/dev/null)
+  BUILD=$(git rev-list $BUILDTAG..HEAD --count --merges)
+
   if [ $BUILD != 0 ]; then
     printf -- "-%04d" "$BUILD"
   fi