diff options
| author | Mike McQuaid | 2015-06-13 18:33:29 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2015-06-13 18:35:19 +0100 |
| commit | 9c7b3b02ce3d6f007894e2b7137772d42a75c772 (patch) | |
| tree | 2681dd39b0ab712355f8c8b36dbf04b0ec92cf1a /Library | |
| parent | bd0f1794787a676b38bd6639bd56ff0bb2ed7c4a (diff) | |
| download | brew-9c7b3b02ce3d6f007894e2b7137772d42a75c772.tar.bz2 | |
test-bot: always do a `git clean -ffdx`
This ensures that all nested Git repositories (e.g. taps) are also
deleted. Previously this wasn't needed as we could just rely on the
symlinks in `Library/Formula` being missing but since Xu's good work
this inadvertedly made the bot's `brew uses foo` start showing things
from taps we hadn't previously deleted.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/test-bot.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index 0161d77e6..e03a0191f 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -553,8 +553,7 @@ module Homebrew git "rebase", "--abort" git "reset", "--hard" git "checkout", "-f", "master" - git "clean", "-fdx" - git "clean", "-ffdx" unless $?.success? + git "clean", "-ffdx" pr_locks = "#{HOMEBREW_REPOSITORY}/.git/refs/remotes/*/pr/*/*.lock" Dir.glob(pr_locks) {|lock| FileUtils.rm_rf lock } end @@ -564,8 +563,7 @@ module Homebrew checkout_args = [] if ARGV.include? '--cleanup' - git "clean", "-fdx" - test "git", "clean", "-ffdx" unless $?.success? + test "git", "clean", "-ffdx" checkout_args << "-f" end |