Merge branch 'master' into 4.0-pre-not-stable

2014-01-20 14:41:07 +01:00 · 2014-01-20 14:41:07 +01:00 · 131ee68aed
commit 131ee68aed
parent 3ca911dbc6 e40fde92fc
1 changed files with 7 additions and 1 deletions
--- a/bin/build-helper
+++ b/bin/build-helper
@ -207,8 +207,14 @@ eof
        # Ensure we are on the master branch
        if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
            echo "Releases are happening from the master branch, aborting"
+
+            echo "Enter the magic word to release anyway"
+            read magicword
+
+            if [ "$magicword" != "iknowwhatido" ]; then
                exit 1
            fi
+        fi

        # Ensure version branch exists
        if ! git rev-parse --verify refs/heads/$target_branch 2>/dev/null; then