From 4174bf147c50dc09b46820562a77ce2522020504 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 26 Jul 2016 21:00:00 -0600 Subject: [PATCH] test-bot: don't checkout/reset on --no-pull --- Library/Homebrew/dev-cmd/test-bot.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb index 548c973a36..2ee74133c0 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