mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #998 from MikeMcQuaid/update-between-tags

Browse Source 
update.sh: update to latest Homebrew/brew tag.
This commit is contained in:
Mike McQuaid 2016-09-21 09:25:50 +01:00 committed by GitHub
commit d5b6ecfc50
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/brew.sh
View File

@ -1,4 +1,4 @@
HOMEBREW_VERSION="0.9.9" HOMEBREW_VERSION="1.0.0"
onoe() { onoe() {
if [[ -t 2 ]] # check whether stderr is a tty. if [[ -t 2 ]] # check whether stderr is a tty.

15
Library/Homebrew/cmd/update.sh
View File

@ -215,7 +215,18 @@ merge_or_rebase() {
trap reset_on_interrupt SIGINT 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)" ]] if [[ -n "$(git status --untracked-files=all --porcelain 2>/dev/null)" ]]
then then
@ -337,7 +348,7 @@ EOS
set -x set -x
fi fi
if [[ -z "$HOMEBREW_UPDATE_CLEANUP" ]] if [[ -z "$HOMEBREW_UPDATE_CLEANUP" && -z "$HOMEBREW_UPDATE_TO_TAG" ]]
then then
if [[ -n "$HOMEBREW_DEVELOPER" || -n "$HOMEBREW_DEV_CMD_RUN" ]] if [[ -n "$HOMEBREW_DEVELOPER" || -n "$HOMEBREW_DEV_CMD_RUN" ]]
then then