update.sh: always use stable branch for tags.

This avoids creating a new branch that’ll never be deleted for each tag
and differentiates between the `master` and `stable` branches.
This commit is contained in:
Mike McQuaid 2016-09-24 17:25:15 +01:00
parent 6eebea4525
commit 22299cffab

View File

@ -225,7 +225,7 @@ merge_or_rebase() {
if [ -n "$UPSTREAM_TAG" ] if [ -n "$UPSTREAM_TAG" ]
then then
REMOTE_REF="refs/tags/$UPSTREAM_TAG" REMOTE_REF="refs/tags/$UPSTREAM_TAG"
UPSTREAM_BRANCH="v$UPSTREAM_TAG" UPSTREAM_BRANCH="stable"
else else
REMOTE_REF="origin/$UPSTREAM_BRANCH" REMOTE_REF="origin/$UPSTREAM_BRANCH"
fi fi