diff options
| author | Mike McQuaid | 2015-02-19 11:52:04 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2015-02-19 11:52:04 +0000 |
| commit | 2805a62af27ad587f7da55cd062fd30d1cc7b2d5 (patch) | |
| tree | 93e76f5e1431b103df5d291dc5f7d87090f20f56 | |
| parent | 9061daad5ef9ff0e98f2c541603c4a097023a230 (diff) | |
| download | brew-2805a62af27ad587f7da55cd062fd30d1cc7b2d5.tar.bz2 | |
test-bot: cleanup even more in tap directories.
| -rw-r--r-- | Library/Homebrew/cmd/test-bot.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index 6973494aa..5f7b31c18 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" |