From 1d1bad98b7c77092262f68870cfcfdba2e8a4380 Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Tue, 10 Dec 2013 21:41:09 +0000
Subject: brew-test-bot: remember to pull the PR.

---
 Library/Contributions/cmd/brew-test-bot.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'Library')

diff --git a/Library/Contributions/cmd/brew-test-bot.rb b/Library/Contributions/cmd/brew-test-bot.rb
index 919b81ab5..aeb7606c1 100755
--- a/Library/Contributions/cmd/brew-test-bot.rb
+++ b/Library/Contributions/cmd/brew-test-bot.rb
@@ -419,11 +419,17 @@ if ARGV.include? '--ci-pr-upload' or ARGV.include? '--ci-testing-upload'
   ARGV << '--verbose'
   copied = system "cp #{jenkins}/jobs/\"#{job}\"/configurations/axis-version/*/builds/#{id}/archive/*.bottle*.* ."
   exit unless copied
-  safe_system "brew bottle --merge --write *.bottle*.rb"
 
-  remote = "git@github.com:BrewTestBot/homebrew.git"
   pr = ENV['UPSTREAM_PULL_REQUEST']
   number = ENV['UPSTREAM_BUILD_NUMBER']
+
+  if ARGV.include? '--ci-pr-upload'
+    safe_system "brew pull --clean #{pr}"
+  end
+
+  safe_system "brew bottle --merge --write *.bottle*.rb"
+
+  remote = "git@github.com:BrewTestBot/homebrew.git"
   tag = pr ? "pr-#{pr}" : "testing-#{number}"
   safe_system "git push --force #{remote} :refs/tags/#{tag}"
 
-- 
cgit v1.2.3