From 5a0a3971b0c2769bf3b1c0202b0d48be6db71bb9 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 20 Jan 2014 14:48:05 +0100
Subject: [PATCH] do not change to the masterbranch...

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 bin/build-helper | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/build-helper b/bin/build-helper
index 6210b907..bfd7d31c 100755
--- a/bin/build-helper
+++ b/bin/build-helper
@@ -247,8 +247,10 @@ eof
         "$0" release-git-tag
 
         # Also merge back the version branch
-        git checkout master
-        git merge "$target_branch"
+        if [ "$masterbranch" = yes ]; then
+            git checkout master
+            git merge "$target_branch"
+        fi
 
         # Publish git changes
         make pub