kjg/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Nico Schottelius 2014-01-20 14:41:07 +01:00
commit 131ee68aed
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/build-helper
View file

@ -207,7 +207,13 @@ eof
# Ensure we are on the master branch # Ensure we are on the master branch
if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
echo "Releases are happening from the master branch, aborting" echo "Releases are happening from the master branch, aborting"
exit 1
echo "Enter the magic word to release anyway"
read magicword
if [ "$magicword" != "iknowwhatido" ]; then
exit 1
fi
fi fi
# Ensure version branch exists # Ensure version branch exists