From 172be781a7654d4109d48f1e1f436a122a936622 Mon Sep 17 00:00:00 2001 From: Dan Vanderkam Date: Thu, 29 Aug 2013 18:54:54 -0400 Subject: [PATCH] update release.sh script to do releases on "releases" branch. --- release.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/release.sh b/release.sh index 87bcc1d..c92db4f 100755 --- a/release.sh +++ b/release.sh @@ -42,7 +42,12 @@ if [ $? -ne 0 ]; then exit 1 fi -# Everything is good. Tag this release and push it. +# Everything is good. +# Switch to the "releases" branch, merge this change and tag it. +echo "Switching branches to do the release." +git checkout releases +git merge --no-ff $branch + COMMIT=$(git rev-parse HEAD) echo "Tagging commit $COMMIT as version $VERSION" git tag -a "v$VERSION" -m "Release of version $VERSION" @@ -50,3 +55,6 @@ git push --tags echo "Release was successful!" echo "Don't forget to merge changes on this branch back into master." + +# Discourage users from working on the "releases" branch. +git checkout master -- 2.7.4