Merge pull request #1121 from MikeMcQuaid/update-stable-branch
update.sh: always use stable branch for tags.
This commit is contained in:
commit
2f82837b77
@ -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
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user