From 3039046a6d0c83a75cf96d3b5dec788496da32a0 Mon Sep 17 00:00:00 2001
From: Adam Harrison <harrisonadamw@gmail.com>
Date: Tue, 15 Sep 2015 10:41:24 +0100
Subject: [PATCH 1/3] Strip v prefix for mainline and branch releases

---
 bin/release | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/release b/bin/release
index c75169b4..e4422a1a 100755
--- a/bin/release
+++ b/bin/release
@@ -52,7 +52,11 @@ setup() {
     LATEST_TAG_COMMIT_SHA=$(git rev-list -1 $LATEST_TAG)
     LATEST_RELEASE_SHA=$(git rev-parse latest_release)
     LATEST_RELEASE_COMMIT_SHA=$(git rev-list -1 latest_release)
-    VERSION=${LATEST_TAG}
+    if [ "$RELEASE_TYPE" != 'PRERELEASE' ] ; then
+        VERSION=${LATEST_TAG#v}
+    else
+        VERSION=${LATEST_TAG}
+    fi
     # NB does not check that this tag is on master
     RELEASE_DIR=./releases/$LATEST_TAG
 }

From 44c2861aba757e4bed2d59fe53b065f919232ab9 Mon Sep 17 00:00:00 2001
From: Adam Harrison <harrisonadamw@gmail.com>
Date: Tue, 15 Sep 2015 10:41:41 +0100
Subject: [PATCH 2/3] Update release process doc

---
 docs/release-process.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/release-process.md b/docs/release-process.md
index 3f00d751..10c2f2ac 100644
--- a/docs/release-process.md
+++ b/docs/release-process.md
@@ -31,7 +31,7 @@ behaviours for that type of release will be obtained from the script.
 * Choose a version tag (see above) henceforth referred to as `$TAG`.
 * Add a changelog entry for the new tag at the top of `CHANGELOG.md`.
   The first line must be a markdown header of the form `## Release
-  $TAG`
+  $TAG` for **Prerelease** builds, `## Release ${TAG#v}` otherwise.
 
 Commit the changelog update:
 

From 6dfefb95e8ccc70489174174554f05b52adfb06b Mon Sep 17 00:00:00 2001
From: Adam Harrison <harrisonadamw@gmail.com>
Date: Tue, 15 Sep 2015 10:43:00 +0100
Subject: [PATCH 3/3] Advise installation of weaveworks github-release fork

---
 bin/release | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/release b/bin/release
index e4422a1a..efe43fe3 100755
--- a/bin/release
+++ b/bin/release
@@ -256,8 +256,8 @@ usage() {
 # Ensure required tooling is installed
 if ! which github-release >/dev/null; then
     echo "Please install git-release:" >&2
-    echo -e "\tgo get github.com/aktau/github-release" >&2
-    echo "and create a git token per https://github.com/aktau/github-release" >&2
+    echo -e "\tgo get github.com/weaveworks/github-release" >&2
+    echo "and create a git token per https://github.com/weaveworks/github-release" >&2
     exit 1
 fi