Merge pull request #3455 from MikeMcQuaid/bottle_homebrew_git

bottle: use HOMEBREW_GIT_* vars.

1 files changed, 11 insertions, 0 deletions

diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb
index a54211f5c..204e7cef9 100644
--- a/Library/Homebrew/dev-cmd/bottle.rb
+++ b/Library/Homebrew/dev-cmd/bottle.rb
@@ -469,6 +469,17 @@ module Homebrew
         end
 
         unless ARGV.include? "--no-commit"
+          if ENV["HOMEBREW_GIT_NAME"]
+            ENV["GIT_AUTHOR_NAME"] =
+              ENV["GIT_COMMITTER_NAME"] =
+                ENV["HOMEBREW_GIT_NAME"]
+          end
+          if ENV["HOMEBREW_GIT_EMAIL"]
+            ENV["GIT_AUTHOR_EMAIL"] =
+              ENV["GIT_COMMITTER_EMAIL"] =
+                ENV["HOMEBREW_GIT_EMAIL"]
+          end
+
           short_name = formula_name.split("/", -1).last
           pkg_version = bottle_hash["formula"]["pkg_version"]