From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 19 Dec 2018 09:13:51 +0000 (+0200)
Subject: Don't run branch in branch-release if branch is not given
X-Git-Tag: v1.43.0~136^2~216
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=612d21fb8afa6532906fe58122da16a14a28238c;p=simantics%2Fplatform.git

Don't run branch in branch-release if branch is not given

Change-Id: I033d3bbf3d75330b40f4c3185fa6e1eb968c5936
---

diff --git a/releng/doc/release-helper.sh b/releng/doc/release-helper.sh
index 6e56cb55e..7875b863c 100755
--- a/releng/doc/release-helper.sh
+++ b/releng/doc/release-helper.sh
@@ -385,7 +385,9 @@ case "$action" in
 	branch-release)
 		fromBranch=$1
 		popd > /dev/null
-		bash $selfpath $version $fromBranch $user checkout
+		if [ -ne $fromBranch ]; then
+			bash $selfpath $version $fromBranch $user checkout
+		fi
 		bash $selfpath $version $branch $user branch
 		bash $selfpath $version $branch $user checkout
 		bash $selfpath $version $branch $user prepare-release-branch $fromBranch