brew-test-bot: handle git repositories for upload.

1 files changed, 6 insertions, 0 deletions

diff --git a/Library/Contributions/cmd/brew-test-bot.rb b/Library/Contributions/cmd/brew-test-bot.rb
index 504c34a2c..dad47fc94 100755
--- a/Library/Contributions/cmd/brew-test-bot.rb
+++ b/Library/Contributions/cmd/brew-test-bot.rb
@@ -431,6 +431,12 @@ if ARGV.include? '--ci-pr-upload' or ARGV.include? '--ci-testing-upload'
   pr = ENV['UPSTREAM_PULL_REQUEST']
   number = ENV['UPSTREAM_BUILD_NUMBER']
 
+  system "git am --abort 2>/dev/null"
+  system "git rebase --abort 2>/dev/null"
+  safe_system "git reset --hard"
+  safe_system "git checkout -f master"
+  safe_system "brew update"
+
   if ARGV.include? '--ci-pr-upload'
     safe_system "brew pull --clean #{pr}"
   end