From 19e5eda7733d217552e5d1f345affd4d65a93a70 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 10 Apr 2017 15:52:37 +0100 Subject: [PATCH 1/2] Don't leave the gh-pages branch checked out After a pre-release, check out the release branch again rather than leaving the working copy on the gh-pages branch --- release.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/release.sh b/release.sh index 1ec4afb6d..f05252605 100755 --- a/release.sh +++ b/release.sh @@ -238,6 +238,7 @@ fi # if it is a pre-release, leave it on the release branch for now. if [ $prerelease -eq 1 ]; then exit 0 + git checkout "$rel_branch" fi # merge release branch to master From 4523ae7d29a1cb5d75429d6a67c269bb97e11ae4 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 10 Apr 2017 16:15:06 +0100 Subject: [PATCH 2/2] Checkout release branch *before* exiting script --- release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.sh b/release.sh index f05252605..cebeb0139 100755 --- a/release.sh +++ b/release.sh @@ -237,8 +237,8 @@ fi # if it is a pre-release, leave it on the release branch for now. if [ $prerelease -eq 1 ]; then - exit 0 git checkout "$rel_branch" + exit 0 fi # merge release branch to master