From 0a9b34d121a60f39869c251de942c3ef53fd583b Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Mon, 17 Dec 2018 19:17:29 +0000
Subject: [PATCH] Revert "Merge pull request #259 from neilalexander/semver"

This reverts commit 51b3746df682b50f5d6a3f6c5bcd10b36e4dc8b1, reversing
changes made to 6e87791e50f38fe310771858888b661831a0fd61.
---
 contrib/semver/version.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/contrib/semver/version.sh b/contrib/semver/version.sh
index eab5ab86..331046f3 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 that denotes moving to a major version number
+# Get the last tag
 TAG=$(git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.0" 2>/dev/null)
 
 # Get last merge to master
@@ -33,6 +33,9 @@ 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)
@@ -53,10 +56,6 @@ 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