test-bot: don't checkout/reset on --no-pull

This commit is contained in:
Mike McQuaid 2016-07-26 21:00:00 -06:00
parent 157d461626
commit 4174bf147c

View File

@ -685,8 +685,10 @@ module Homebrew
git "stash"
git "am", "--abort"
git "rebase", "--abort"
git "checkout", "-f", "master"
git "reset", "--hard", "origin/master"
unless ARGV.include? "--no-pull"
git "checkout", "-f", "master"
git "reset", "--hard", "origin/master"
end
git "clean", "-ffdx"
unless @repository == HOMEBREW_REPOSITORY
HOMEBREW_REPOSITORY.cd do