From 70d85ecd28310a3318ca981eefb6e32b22d04f0a Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Tue, 5 Jul 2016 16:15:46 +0200
Subject: [PATCH] Update release.sh: should only be run on `dev` branch

---
 release.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/release.sh b/release.sh
index 35954b5bc..a8f35511a 100755
--- a/release.sh
+++ b/release.sh
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+### Control that the script is run on `dev` branch
+branch=`git rev-parse --abbrev-ref HEAD`
+if [[ ! "$branch" = "dev" ]];
+then
+  echo ">> This script must be run under \`dev\` branch"
+  exit
+fi
+
+### Releasing
 current=`grep -P "version\": \"\d+.\d+.\d+(\w*)" package.json | grep -oP "\d+.\d+.\d+(\w*)"`
 echo "Current version: $current"
 
@@ -47,7 +56,10 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ ]]; then
       ;;
   esac
   git commit -m "v$2"
+  git checkout master
+  git merge dev
   git tag "v$2"
+  git checkout dev
 else
   echo "Wrong version format"
 fi
-- 
GitLab