diff options
| author | Mike McQuaid | 2015-02-19 11:52:04 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2015-02-19 11:52:04 +0000 |
| commit | 20e0aec2f2c55ac10a9cb1fcfb208cc7e1086b67 (patch) | |
| tree | 48d1bf12cc38f8141680447473951db0c6b086e5 /Library/Homebrew | |
| parent | ea8d7c1fc6af28e303e5c02cbcd38d0e4acfbfed (diff) | |
| download | homebrew-20e0aec2f2c55ac10a9cb1fcfb208cc7e1086b67.tar.bz2 | |
test-bot: cleanup even more in tap directories.
Diffstat (limited to 'Library/Homebrew')
| -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" |