inrin/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:43:56 +01:00
commit 7fb322c83c
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/build-helper
View file

@ -205,17 +205,21 @@ eof
fi fi
# Ensure we are on the master branch # Ensure we are on the master branch
masterbranch=yes
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"
echo "Enter the magic word to release anyway" echo "Enter the magic word to release anyway"
read magicword read magicword
if [ "$magicword" != "iknowwhatido" ]; then if [ "$magicword" = "iknowwhatido" ]; then
masterbranch=no
else
exit 1 exit 1
fi fi
fi fi
if [ "$masterbranch" = yes ]; then
# Ensure version branch exists # Ensure version branch exists
if ! git rev-parse --verify refs/heads/$target_branch 2>/dev/null; then if ! git rev-parse --verify refs/heads/$target_branch 2>/dev/null; then
git branch "$target_branch" git branch "$target_branch"
@ -224,6 +228,7 @@ eof
# Merge master branch into version branch # Merge master branch into version branch
git checkout "$target_branch" git checkout "$target_branch"
git merge master git merge master
fi
# Verify that after the merge everything works # Verify that after the merge everything works
"$0" check-date "$0" check-date