From b26a0d4a911ba400f306ccc8bdc8cee42dd302bb Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 27 Nov 2017 10:15:26 +0000
Subject: [PATCH] Enable environment filtering for developers.

If folks have set `HOMEBREW_DEVELOPER` or run a `dev-cmd` then enable
environment filtering by default for them.
---
 Library/Homebrew/brew.sh          | 10 ----------
 Library/Homebrew/system_config.rb |  1 +
 bin/brew                          | 23 +++++++++++++++++++++++
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index bd88a23f51518..c8f66bd459f69 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -246,16 +246,6 @@ case "$HOMEBREW_COMMAND" in
   --config)    HOMEBREW_COMMAND="config" ;;
 esac
 
-if [[ -z "$HOMEBREW_DEVELOPER" ]]
-then
-  export HOMEBREW_GIT_CONFIG_FILE="$HOMEBREW_REPOSITORY/.git/config"
-  HOMEBREW_GIT_CONFIG_DEVELOPERMODE="$(git config --file="$HOMEBREW_GIT_CONFIG_FILE" --get homebrew.devcmdrun 2>/dev/null)"
-  if [[ "$HOMEBREW_GIT_CONFIG_DEVELOPERMODE" = "true" ]]
-  then
-    export HOMEBREW_DEV_CMD_RUN="1"
-  fi
-fi
-
 if [[ -f "$HOMEBREW_LIBRARY/Homebrew/cmd/$HOMEBREW_COMMAND.sh" ]]
 then
   HOMEBREW_BASH_COMMAND="$HOMEBREW_LIBRARY/Homebrew/cmd/$HOMEBREW_COMMAND.sh"
diff --git a/Library/Homebrew/system_config.rb b/Library/Homebrew/system_config.rb
index ef7572d227f8e..28eecf951f8d1 100644
--- a/Library/Homebrew/system_config.rb
+++ b/Library/Homebrew/system_config.rb
@@ -185,6 +185,7 @@ def dump_verbose_config(f = $stdout)
         HOMEBREW_BREW_FILE
         HOMEBREW_COMMAND_DEPTH
         HOMEBREW_CURL
+        HOMEBREW_GIT_CONFIG_FILE
         HOMEBREW_LIBRARY
         HOMEBREW_MACOS_VERSION
         HOMEBREW_RUBY_PATH
diff --git a/bin/brew b/bin/brew
index 8b95b46edac6e..965de4fa8ec87 100755
--- a/bin/brew
+++ b/bin/brew
@@ -59,6 +59,29 @@ do
   export "$VAR_NEW"="${!VAR}"
 done
 
+# Set HOMEBREW_DEVELOPER for users who have run a development command
+if [[ -z "$HOMEBREW_DEVELOPER" ]]
+then
+  export HOMEBREW_GIT_CONFIG_FILE="$HOMEBREW_REPOSITORY/.git/config"
+  HOMEBREW_GIT_CONFIG_DEVELOPERMODE="$(git config --file="$HOMEBREW_GIT_CONFIG_FILE" --get homebrew.devcmdrun 2>/dev/null)"
+  if [[ "$HOMEBREW_GIT_CONFIG_DEVELOPERMODE" = "true" ]]
+  then
+    export HOMEBREW_DEV_CMD_RUN="1"
+  fi
+fi
+
+if [[ -z "$HOMEBREW_NO_ENV_FILTERING" ]]
+then
+  if [[ -n "$HOMEBREW_DEVELOPER" || -n "$HOMEBREW_DEV_CMD_RUN" ]]
+  then
+    # Use env filtering by default for users who have run a development command
+    # This will be enabled by default for all users in future.
+    export HOMEBREW_ENV_FILTERING="1"
+  fi
+else
+  unset HOMEBREW_ENV_FILTERING
+fi
+
 # test-bot sets environment filtering itself
 if [[ -n "$HOMEBREW_ENV_FILTERING" && "$1" != "test-bot" ]]
 then