From 93ceae3bef12d5daccf7b90b9bf0c21c06c7b11c Mon Sep 17 00:00:00 2001
From: Edwin Eefting <edwin@datux.nl>
Date: Fri, 12 Jan 2018 01:56:34 +0100
Subject: [PATCH] fixed releasebot issues with multiple branches

---
 release    | 5 ++++-
 releasebot | 5 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/release b/release
index 34e09402e..416723391 100755
--- a/release
+++ b/release
@@ -4,7 +4,10 @@ NEW="$1"
 
 [ "$NEW" != "" ] || exit 1
 
-PREV=`git tag --sort=creatordate|tail -1`
+echo "Creating release $NEW"
+
+NEWBASE=`echo "$NEW"|cut -f1 -d'-'`
+PREV=`git tag --sort=creatordate|grep "^$NEWBASE"|tail -1`
 
 ############## update Release_notes.txt
 NOTES="dist/Release_notes.txt"
diff --git a/releasebot b/releasebot
index a2813dbda..e04d84585 100755
--- a/releasebot
+++ b/releasebot
@@ -5,9 +5,8 @@
 git pull
 
 #new commits since last tag?
-if ! git describe --exact-match 2>/dev/null; then
-    BRANCH=`git rev-parse --abbrev-ref HEAD`
+BRANCH=`git rev-parse --abbrev-ref HEAD`
+if ! git describe --exact-match 2>/dev/null | grep "^$BRANCH"; then
     TAG="$BRANCH-`date +%Y%m%d`"
     ./release "$TAG"
 fi
-