From bc2db5f50c1aecddc1ec20c745bbc0f41b297706 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Mon, 10 Dec 2018 15:49:21 -0600
Subject: [PATCH] Add branch-only mode to force skipping tags

Setting TAG="" didn't work and isn't great UX anyway so
let's add -b to just set BRANCH_ONLY mode to match -t
for TAG_ONLY.

Change-Id: I4223504b4ec215376722037ecfab1416e1195f9f
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
---
 release/branch-stx.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/release/branch-stx.sh b/release/branch-stx.sh
index febb6d78..f82af92d 100755
--- a/release/branch-stx.sh
+++ b/release/branch-stx.sh
@@ -6,6 +6,8 @@
 # --dry-run|-n      Do all work except pushing back to the remote repo.
 #                   Useful to validate everything locally before pushing.
 #
+# -b                Set branch only (sets TAG="")
+#
 # -l                List the repo URLS that would be processed and exit
 #
 # -m <manifest>     Extract the repo list from <manifest> for starlingx
@@ -53,7 +55,7 @@ set -e
 # Defaults
 MANIFEST=""
 
-optspec="lm:nt-:"
+optspec="blm:nt-:"
 while getopts "$optspec" o; do
     case "${o}" in
         # Hack in longopt support
@@ -70,6 +72,9 @@ while getopts "$optspec" o; do
 
             esac
             ;;
+        b)
+            BRANCH_ONLY=1
+            ;;
         l)
             LIST=1
             ;;
@@ -105,6 +110,11 @@ TAG=${TAG:-$SERIES.0}
 # The list of remotes to extract from MANIFEST
 REMOTES="starlingx stx-staging"
 
+if [[ -n $BRANCH_ONLY ]]; then
+    # Force tag to be empty
+    TAG=""
+fi
+
 if [[ -n $TAG_ONLY ]]; then
     # Force source and target branches to be the same
     SRC_BRANCH=${BRANCH}