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.
This commit is contained in:
Mike McQuaid 2015-06-13 18:33:29 +01:00
parent bd0f179478
commit 9c7b3b02ce

View File

@ -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