From f31e01c3ade52dc035ffd56751281da608fe0320 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 17 Feb 2020 19:40:44 +0000
Subject: [PATCH] test: set Git name and email.

Extract the code from `bottle.rb` into `utils/git.rb` and ensure it's
run before we run tests.

Should resolve issues like in
https://github.com/Homebrew/homebrew-core/pull/50328
---
 Library/Homebrew/dev-cmd/bottle.rb | 10 +---------
 Library/Homebrew/formula.rb        |  1 +
 Library/Homebrew/utils/git.rb      |  8 ++++++++
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb
index 505b6b1675..43d3ddd59f 100644
--- a/Library/Homebrew/dev-cmd/bottle.rb
+++ b/Library/Homebrew/dev-cmd/bottle.rb
@@ -558,15 +558,7 @@ module Homebrew
         end
 
         unless args.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
+          Utils.set_git_name_email!
 
           short_name = formula_name.split("/", -1).last
           pkg_version = bottle_hash["formula"]["pkg_version"]
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index e7d0ff46f5..11eea85d83 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -1744,6 +1744,7 @@ class Formula
     }
 
     ENV.clear_sensitive_environment!
+    Utils.set_git_name_email!
 
     mktemp("#{name}-test") do |staging|
       staging.retain! if ARGV.keep_tmp?
diff --git a/Library/Homebrew/utils/git.rb b/Library/Homebrew/utils/git.rb
index ea479cc79e..289fc64fdd 100644
--- a/Library/Homebrew/utils/git.rb
+++ b/Library/Homebrew/utils/git.rb
@@ -102,4 +102,12 @@ module Utils
 
     quiet_system "git", "ls-remote", url
   end
+
+  def self.set_git_name_email!
+    return unless ENV["HOMEBREW_GIT_NAME"]
+    return unless ENV["HOMEBREW_GIT_EMAIL"]
+
+    ENV["GIT_AUTHOR_NAME"]  = ENV["GIT_COMMITTER_NAME"]  = ENV["HOMEBREW_GIT_NAME"]
+    ENV["GIT_AUTHOR_EMAIL"] = ENV["GIT_COMMITTER_EMAIL"] = ENV["HOMEBREW_GIT_EMAIL"]
+  end
 end