From 2f934900546e9ca1f34178e7ad393dcd3b7fe4d2 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 17 Mar 2016 00:19:30 +0000
Subject: [PATCH] Don't create release branch if we're already there

---
 release.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/release.sh b/release.sh
index 577bf92be..90863c3b8 100755
--- a/release.sh
+++ b/release.sh
@@ -30,8 +30,11 @@ rel_branch="release-$tag"
 
 cd `dirname $0`
 
-echo "Creating release branch"
-git checkout -b "$rel_branch"
+# we might already be on the release branch, in which case, yay
+if [ $(git symbolic-ref --short HEAD) != "$rel_branch" ]; then
+    echo "Creating release branch"
+    git checkout -b "$rel_branch"
+fi
 
 echo "Generating changelog"
 update_changelog "$release"