Merge "The 'remote branch' should always be a linaro-local/ snapshots or releases branch."

1 files changed, 2 insertions, 13 deletions

diff --git a/tcwg-release.sh b/tcwg-release.sh
index 29f4582..19aee70 100755
--- a/tcwg-release.sh
+++ b/tcwg-release.sh
@@ -543,20 +543,9 @@ fi
 # The local branch can have the SPIN number on the name.
 local_branch=${SNAPSHOT:+snapshots/}${RELEASE:+releases/}${CANDIDATE:+releases/}linaro-${release}${SPIN:+-$SPIN}${CANDIDATE:+-rc${RC}}
 
-print_info "${bold}Determining remote tracking branch information..."
-
 # Release candidates and releases always push against the future or current
-# release branch.
-if [[ "${CANDIDATE:+set}" = "set" || "${RELEASE:+set}" = "set" ]]; then
-    remote_branch="remotes/${REMOTE}/linaro-local/linaro-${release}"
-else
-    # linaro-local branches aren't a place to push snapshots to so filter them
-    # out.
-    remote_branch="$(git branch -r --contains ${track} | grep -v "linaro-local" | grep -e "${REMOTE}" -m1)"
-
-    # git prepends two spaces to the front of branch output.
-    remote_branch="remotes/${remote_branch#  }"
-fi
+# release branch.  Snapshots always go into the snapshots namespace.
+remote_branch="remotes/${REMOTE}/linaro-local/${SNAPSHOT:+snapshots}${RELEASE:+releases}${CANDIDATE:+releases}/linaro-${release}"
 
 # The rest of the uses of ${release} should include the SPIN number so add the
 # SPIN number if it was specified.