From 0b0893e26e801856fad96fda2a514c27f7140457 Mon Sep 17 00:00:00 2001
From: Dominyk Tiller
Date: Sat, 27 Aug 2016 02:46:18 +0100
Subject: brew: execute update before tap

This seems generally like a good idea given that we're making syntax changes to
formulae & are going to keep doing so for a little while yet. Taps may have moved
over to that syntax, which then causes tap failures if brew isn't up-to-date.

Should fix situations like https://github.com/Homebrew/homebrew-php/issues/3545.
---
 Library/Homebrew/brew.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Library')

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index c7bc840e7..719bee9e8 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -247,7 +247,7 @@ update-preinstall() {
   [[ -z "$HOMEBREW_NO_AUTO_UPDATE" ]] || return
   [[ -z "$HOMEBREW_UPDATE_PREINSTALL" ]] || return
 
-  if [[ "$HOMEBREW_COMMAND" = "install" || "$HOMEBREW_COMMAND" = "upgrade" ]]
+  if [[ "$HOMEBREW_COMMAND" = "install" || "$HOMEBREW_COMMAND" = "upgrade" || "$HOMEBREW_COMMAND" = "tap" ]]
   then
     brew update --preinstall
   fi
-- 
cgit v1.2.3


From 003b39bc84f87a3aa126312377cb90d3fcdf1625 Mon Sep 17 00:00:00 2001
From: Dominyk Tiller
Date: Sat, 27 Aug 2016 15:57:09 +0100
Subject: man: update for tap preinstall

---
 Library/Homebrew/manpages/brew.1.md.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/manpages/brew.1.md.erb b/Library/Homebrew/manpages/brew.1.md.erb
index 7bdcc7b92..60557173d 100644
--- a/Library/Homebrew/manpages/brew.1.md.erb
+++ b/Library/Homebrew/manpages/brew.1.md.erb
@@ -182,8 +182,8 @@ can take several different forms:
     If set, Homebrew will not send analytics. See: <https://github.com/Homebrew/brew/blob/master/share/doc/homebrew/Analytics.md#analytics>
 
   * `HOMEBREW_NO_AUTO_UPDATE`:
-    If set, Homebrew will not auto-update before running `brew install` and
-    `brew upgrade`.
+    If set, Homebrew will not auto-update before running `brew install`,
+    `brew upgrade` or `brew tap`.
 
   * `HOMEBREW_NO_EMOJI`:
     If set, Homebrew will not print the `HOMEBREW_INSTALL_BADGE` on a
-- 
cgit v1.2.3