Merge pull request #130 from MikeMcQuaid/homebrew_git_vars

test-bot: set HOMEBREW_GIT_* vars.
Homebrew · Nov 18, 2017 · 7dbae6c · 7dbae6c
2 parents 0421c34 + 316cd85
commit 7dbae6c
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/cmd/brew-test-bot.rb b/cmd/brew-test-bot.rb
@@ -1199,6 +1199,9 @@ def test_ci_upload(tap)
 
     ENV["GIT_WORK_TREE"] = tap.path
     ENV["GIT_DIR"] = "#{ENV["GIT_WORK_TREE"]}/.git"
+    ENV["HOMEBREW_GIT_NAME"] = ARGV.value("git-name") || "BrewTestBot"
+    ENV["HOMEBREW_GIT_EMAIL"] = ARGV.value("git-email") ||
+                                "brew-test-bot@googlegroups.com"
 
     if ARGV.include?("--dry-run")
       puts <<-EOS.undent
@@ -1352,12 +1355,6 @@ def sanitize_argv_and_env
     ENV["HOMEBREW_NO_EMOJI"] = "1"
     ENV["HOMEBREW_FAIL_LOG_LINES"] = "150"
     ENV["PATH"] = "#{HOMEBREW_PREFIX}/bin:#{HOMEBREW_PREFIX}/sbin:#{ENV["PATH"]}"
-    ENV["GIT_AUTHOR_NAME"] =
-      ENV["GIT_COMMITTER_NAME"] =
-        ARGV.value("git-name") || "BrewTestBot"
-    ENV["GIT_AUTHOR_EMAIL"] =
-      ENV["GIT_COMMITTER_EMAIL"] =
-        ARGV.value("git-email") || "brew-test-bot@googlegroups.com"
 
     travis = !ENV["TRAVIS"].nil?
     if travis