update.sh: update to latest Homebrew/brew tag.
Rather than following every change on `master` let’s have non-developer users (i.e. those who have never run a `dev-cmd` or set `HOMEBREW_DEVELOPER`) update between tags. This provides a fairly natural beta (the `master` branch`) and stable (the tags) approach without restricting us to any particular way of managing our tags.
This commit is contained in:
parent
f6fef7cdce
commit
b2c7d6d83d
@ -215,7 +215,18 @@ merge_or_rebase() {
|
||||
|
||||
trap reset_on_interrupt SIGINT
|
||||
|
||||
REMOTE_REF="origin/$UPSTREAM_BRANCH"
|
||||
if [[ "$DIR" = "$HOMEBREW_REPOSITORY" && -z "$HOMEBREW_NO_UPDATE_CLEANUP" ]]
|
||||
then
|
||||
UPSTREAM_TAG="$(git tag --list --sort=-version:refname | head -n1)"
|
||||
fi
|
||||
|
||||
if [ -n "$UPSTREAM_TAG" ]
|
||||
then
|
||||
REMOTE_REF="refs/tags/$UPSTREAM_TAG"
|
||||
UPSTREAM_BRANCH="v$UPSTREAM_TAG"
|
||||
else
|
||||
REMOTE_REF="origin/$UPSTREAM_BRANCH"
|
||||
fi
|
||||
|
||||
if [[ -n "$(git status --untracked-files=all --porcelain 2>/dev/null)" ]]
|
||||
then
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user