pull: set env GIT_COMMITTER_* before git am

scpeters · Nov 26, 2017 · ba175a5 · MikeMcQuaid · Nov 26, 2017 · ba175a5
1 parent 86305f7
commit ba175a5
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/Library/Homebrew/dev-cmd/pull.rb b/Library/Homebrew/dev-cmd/pull.rb
@@ -340,6 +340,15 @@ def apply_patch
       patch_args << "-3"
       patch_args << patchpath
 
+      # git am sometimes needs GIT_COMMITTER_EMAIL to be set
+      # https://github.com/Homebrew/homebrew-test-bot/issues/131
+      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
+
       begin
         safe_system "git", "am", *patch_args
       rescue ErrorDuringExecution