admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #5349 from MikeMcQuaid/update-from-tag-tweaks

Browse Source 
Tweak HOMEBREW_UPDATE_TO_TAG
This commit is contained in:
Mike McQuaid 2018-11-26 14:28:10 +00:00 committed by GitHub
commit 6f0ef7deec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -266,6 +266,11 @@ EOS
then then
git checkout --force "$UPSTREAM_BRANCH" "${QUIET_ARGS[@]}" git checkout --force "$UPSTREAM_BRANCH" "${QUIET_ARGS[@]}"
else else
if [[ -n "$UPSTREAM_TAG" && "$UPSTREAM_BRANCH" != "master" ]]
then
git checkout --force -B "master" "origin/master" "${QUIET_ARGS[@]}"
fi
git checkout --force -B "$UPSTREAM_BRANCH" "$REMOTE_REF" "${QUIET_ARGS[@]}" git checkout --force -B "$UPSTREAM_BRANCH" "$REMOTE_REF" "${QUIET_ARGS[@]}"
fi fi
fi fi

4
Library/Homebrew/manpages/brew.1.md.erb
View File

@ -261,6 +261,10 @@ Note that environment variables must have a value set to be detected. For exampl
This issue typically occurs when using FileVault or custom SSD This issue typically occurs when using FileVault or custom SSD
configurations. configurations.
* `HOMEBREW_UPDATE_TO_TAG`:
If set, instructs Homebrew to always use the latest stable tag (even if
developer commands have been run).
* `HOMEBREW_UPGRADE_CLEANUP`: * `HOMEBREW_UPGRADE_CLEANUP`:
If set, `brew upgrade` always assumes `--cleanup` has been passed. If set, `brew upgrade` always assumes `--cleanup` has been passed.

4
docs/Manpage.md
View File

@ -1262,6 +1262,10 @@ Note that environment variables must have a value set to be detected. For exampl
This issue typically occurs when using FileVault or custom SSD This issue typically occurs when using FileVault or custom SSD
configurations. configurations.
* `HOMEBREW_UPDATE_TO_TAG`:
If set, instructs Homebrew to always use the latest stable tag (even if
developer commands have been run).
* `HOMEBREW_UPGRADE_CLEANUP`: * `HOMEBREW_UPGRADE_CLEANUP`:
If set, `brew upgrade` always assumes `--cleanup` has been passed. If set, `brew upgrade` always assumes `--cleanup` has been passed.

4
manpages/brew.1
View File

@ -1384,6 +1384,10 @@ If set, instructs Homebrew to use \fBHOMEBREW_TEMP\fR as the temporary directory
This issue typically occurs when using FileVault or custom SSD configurations\. This issue typically occurs when using FileVault or custom SSD configurations\.
. .
.TP .TP
\fBHOMEBREW_UPDATE_TO_TAG\fR
If set, instructs Homebrew to always use the latest stable tag (even if developer commands have been run)\.
.
.TP
\fBHOMEBREW_UPGRADE_CLEANUP\fR \fBHOMEBREW_UPGRADE_CLEANUP\fR
If set, \fBbrew upgrade\fR always assumes \fB\-\-cleanup\fR has been passed\. If set, \fBbrew upgrade\fR always assumes \fB\-\-cleanup\fR has been passed\.
. .