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

Tweak HOMEBREW_UPDATE_TO_TAG

Library/Homebrew/cmd/update.sh

@@ -266,6 +266,11 @@ EOS
     then
       git checkout --force "$UPSTREAM_BRANCH" "${QUIET_ARGS[@]}"
     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[@]}"
     fi
   fi

Library/Homebrew/manpages/brew.1.md.erb

@@ -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
     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`:
     If set, `brew upgrade` always assumes `--cleanup` has been passed.
 

docs/Manpage.md

@@ -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
     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`:
     If set, `brew upgrade` always assumes `--cleanup` has been passed.
 

manpages/brew.1

@@ -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\.
 .
 .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
 If set, \fBbrew upgrade\fR always assumes \fB\-\-cleanup\fR has been passed\.
 .