diff options
| author | Mike McQuaid | 2016-07-26 21:00:00 -0600 |
|---|---|---|
| committer | Mike McQuaid | 2016-07-26 21:00:16 -0600 |
| commit | 4174bf147c50dc09b46820562a77ce2522020504 (patch) | |
| tree | 43a88d08ca5a074214b0ae917e2569e961f47c5f /Library | |
| parent | 157d461626007b22354a85cf463870f283f81fcb (diff) | |
| download | brew-4174bf147c50dc09b46820562a77ce2522020504.tar.bz2 | |
test-bot: don't checkout/reset on --no-pull
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/dev-cmd/test-bot.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb index 548c973a3..2ee74133c 100644 --- a/Library/Homebrew/dev-cmd/test-bot.rb +++ b/Library/Homebrew/dev-cmd/test-bot.rb @@ -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 |