From 2805a62af27ad587f7da55cd062fd30d1cc7b2d5 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 19 Feb 2015 11:52:04 +0000
Subject: [PATCH] test-bot: cleanup even more in tap directories.

---
 Library/Homebrew/cmd/test-bot.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb
index 6973494aa0..5f7b31c188 100644
--- a/Library/Homebrew/cmd/test-bot.rb
+++ b/Library/Homebrew/cmd/test-bot.rb
@@ -652,7 +652,10 @@ module Homebrew
     if ARGV.include? "--ci-reset-and-update"
       Dir.glob("#{HOMEBREW_LIBRARY}/Taps/*/*") do |tap_dir|
         cd tap_dir do
-          safe_system "git", "reset", "--hard"
+          system "git am --abort 2>/dev/null"
+          system "git rebase --abort 2>/dev/null"
+          safe_system "git", "checkout", "-f", "master"
+          safe_system "git", "reset", "--hard", "origin/master"
         end
       end
       safe_system "brew", "update"