aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2016-07-14 10:55:23 +0100
committerMike McQuaid2016-07-14 10:55:23 +0100
commit84c12f9eb180b6a3b2b0306ea2259b46c2d65a46 (patch)
tree938622a1ba8599d0eb47249dae385dfb052b91d1 /Library
parent849ec0f4111577076b8dd1b177058e66cb93e46b (diff)
downloadbrew-84c12f9eb180b6a3b2b0306ea2259b46c2d65a46.tar.bz2
test-bot: add --no-pull flag.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/dev-cmd/test-bot.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb
index c70e83b89..383620be8 100644
--- a/Library/Homebrew/dev-cmd/test-bot.rb
+++ b/Library/Homebrew/dev-cmd/test-bot.rb
@@ -21,6 +21,7 @@
# as raw bytes instead of re-encoding in UTF-8.
# --fast: Don't install any packages, but run e.g. audit anyway.
# --keep-tmp: Keep temporary files written by main installs and tests that are run.
+# --no-pull Don't use `brew pull` when possible.
#
# --ci-master: Shortcut for Homebrew master branch CI options.
# --ci-pr: Shortcut for Homebrew pull request CI options.
@@ -354,7 +355,7 @@ module Homebrew
elsif @url
# TODO: in future Travis CI may need to also use `brew pull` to e.g. push
# the right commit to BrewTestBot.
- if !travis_pr || `git rev-parse #{ENV["sha1"]}` != `git rev-parse HEAD`
+ if !travis_pr || !ARGV.include?("--no-pull")
diff_start_sha1 = current_sha1
test "brew", "pull", "--clean", @url
diff_end_sha1 = current_sha1