Merge pull request #3427 from MikeMcQuaid/bump-formula-pr-env-filtering-github

bump-formula-pr: use GitHub vars under env filter.

4 files changed, 15 insertions, 3 deletions

diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb
index 9fe70da6b..380bb464d 100644
--- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb
+++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb
@@ -117,6 +117,17 @@ module Homebrew
     # user path, too.
     ENV["PATH"] = ENV["HOMEBREW_PATH"]
 
+    # Use the user's browser, too.
+    ENV["BROWSER"] = ENV["HOMEBREW_BROWSER"]
+
+    # Setup GitHub environment variables
+    %w[GITHUB_USER GITHUB_PASSWORD GITHUB_TOKEN].each do |env|
+      homebrew_env = ENV["HOMEBREW_#{env}"]
+      next unless homebrew_env
+      next if homebrew_env.empty?
+      ENV[env] = homebrew_env
+    end
+
     formula = ARGV.formulae.first
 
     if formula
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index ea1b99501..374be49b9 100644
--- a/Library/Homebrew/extend/ENV.rb
+++ b/Library/Homebrew/extend/ENV.rb
@@ -29,7 +29,7 @@ module EnvActivation
 
   def clear_sensitive_environment!
     ENV.each_key do |key|
-      next unless /(cookie|key|token)/i =~ key
+      next unless /(cookie|key|token|password)/i =~ key
       ENV.delete key
     end
   end
diff --git a/Library/Homebrew/system_config.rb b/Library/Homebrew/system_config.rb
index e7e60c985..86b7051fa 100644
--- a/Library/Homebrew/system_config.rb
+++ b/Library/Homebrew/system_config.rb
@@ -207,7 +207,7 @@ class SystemConfig
         next unless key.start_with?("HOMEBREW_")
         next if boring_keys.include?(key)
         next if defaults_hash[key.to_sym] == value
-        value = "set" if key =~ /(cookie|key|token)/i
+        value = "set" if key =~ /(cookie|key|token|password)/i
         f.puts "#{key}: #{value}"
       end
       f.puts hardware if hardware
diff --git a/bin/brew b/bin/brew
index 90e0cf3e9..f64bd4556 100755
--- a/bin/brew
+++ b/bin/brew
@@ -47,7 +47,8 @@ HOMEBREW_LIBRARY="$HOMEBREW_REPOSITORY/Library"
 # Whitelist and copy to HOMEBREW_* all variables previously mentioned in
 # manpage or used elsewhere by Homebrew.
 for VAR in AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY BINTRAY_USER BINTRAY_KEY \
-           BROWSER EDITOR GIT PATH VISUAL
+           BROWSER EDITOR GIT PATH VISUAL \
+           GITHUB_USER GITHUB_PASSWORD GITHUB_TOKEN
 do
   # Skip if variable value is empty.
   [[ -z "${!VAR}" ]] && continue