do not change to the masterbranch...

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:48:05 +01:00 · 2014-01-20 14:48:05 +01:00 · 5a0a3971b0
commit 5a0a3971b0
parent a3c5d32a54
1 changed files with 4 additions and 2 deletions
--- 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