aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/dev-cmd
diff options
context:
space:
mode:
authorMike McQuaid2017-11-27 10:48:03 +0000
committerMike McQuaid2017-11-27 10:48:03 +0000
commitfb6cf0c3f8cc8e440a9e750878faf13430a1e20a (patch)
treec2c95020b07b20aacf445f9e59290ed790c619ec /Library/Homebrew/dev-cmd
parente41a0a3b819ff0dcc8d01a70b589288183ec17bf (diff)
downloadbrew-fb6cf0c3f8cc8e440a9e750878faf13430a1e20a.tar.bz2
More environment filtering fixes
- Make `brew pull` pass through Git environment variables - Whitelist all `TRAVIS_` variables.
Diffstat (limited to 'Library/Homebrew/dev-cmd')
-rw-r--r--Library/Homebrew/dev-cmd/pull.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/Library/Homebrew/dev-cmd/pull.rb b/Library/Homebrew/dev-cmd/pull.rb
index 7746e4db3..5979d87b8 100644
--- a/Library/Homebrew/dev-cmd/pull.rb
+++ b/Library/Homebrew/dev-cmd/pull.rb
@@ -80,6 +80,14 @@ module Homebrew
odie "This command requires at least one argument containing a URL or pull request number"
end
+ # Passthrough Git environment variables for e.g. git am
+ if ENV["HOMEBREW_GIT_NAME"]
+ ENV["GIT_COMMITTER_NAME"] = ENV["HOMEBREW_GIT_NAME"]
+ end
+ if ENV["HOMEBREW_GIT_EMAIL"]
+ ENV["GIT_COMMITTER_EMAIL"] = ENV["HOMEBREW_GIT_EMAIL"]
+ end
+
do_bump = ARGV.include?("--bump") && !ARGV.include?("--clean")
# Formulae with affected bottles that were published