Merge pull request #1121 from MikeMcQuaid/update-stable-branch

update.sh: always use stable branch for tags.
This commit is contained in:
Mike McQuaid 2016-09-24 18:59:10 +01:00 committed by GitHub
commit 2f82837b77

View File

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