test-bot: cleanup even more in tap directories.

2015-02-19 11:52:04 +00:00 · 2015-02-19 11:52:04 +00:00 · 2805a62af2
commit 2805a62af2
parent 9061daad5e
1 changed files with 4 additions and 1 deletions
--- 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"