diff options
| author | Mike McQuaid | 2016-09-26 07:57:25 +0100 |
|---|---|---|
| committer | GitHub | 2016-09-26 07:57:25 +0100 |
| commit | 19952958a80c5f8c87a7ba8a471ceb3cc2f5da47 (patch) | |
| tree | 939a640eea2081541b339166b6cd19c43b3628af /Library/Homebrew/cmd | |
| parent | 6e5735565b9a31ec2b01e02a479a361189729c22 (diff) | |
| parent | 1ff2d06cf0fbad2642f00d9293222e74693343b5 (diff) | |
| download | brew-19952958a80c5f8c87a7ba8a471ceb3cc2f5da47.tar.bz2 | |
Merge pull request #1143 from MikeMcQuaid/update-to-tag-var
update.sh: use HOMEBREW_UPDATE_TO_TAG.
Diffstat (limited to 'Library/Homebrew/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/update.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh index 4d72c6611..685e0e5f5 100644 --- a/Library/Homebrew/cmd/update.sh +++ b/Library/Homebrew/cmd/update.sh @@ -215,7 +215,7 @@ merge_or_rebase() { trap reset_on_interrupt SIGINT - if [[ "$DIR" = "$HOMEBREW_REPOSITORY" && -z "$HOMEBREW_NO_UPDATE_CLEANUP" ]] + if [[ "$DIR" = "$HOMEBREW_REPOSITORY" && -n "$HOMEBREW_UPDATE_TO_TAG" ]] then UPSTREAM_TAG="$(git tag --list --sort=-version:refname | grep --max-count=1 '^[0-9]*\.[0-9]*\.[0-9]*$')" @@ -351,6 +351,8 @@ EOS if [[ -n "$HOMEBREW_DEVELOPER" || -n "$HOMEBREW_DEV_CMD_RUN" ]] then export HOMEBREW_NO_UPDATE_CLEANUP="1" + else + export HOMEBREW_UPDATE_TO_TAG="1" fi fi @@ -471,7 +473,7 @@ EOS UPSTREAM_REPOSITORY="${UPSTREAM_REPOSITORY_URL#https://github.com/}" UPSTREAM_REPOSITORY="${UPSTREAM_REPOSITORY%.git}" - if [[ "$DIR" = "$HOMEBREW_REPOSITORY" && -z "$HOMEBREW_NO_UPDATE_CLEANUP" ]] + if [[ "$DIR" = "$HOMEBREW_REPOSITORY" && -n "$HOMEBREW_UPDATE_TO_TAG" ]] then # Only try to `git fetch` when the upstream tags have changed # (so the API does not return 304: unmodified). |