From 18730f835d6bc54068b44a9e0064a87a36c9944a Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 31 Jan 2014 19:12:41 +0100 Subject: [PATCH] brew-test-bot: reset to origin for bottle upload. --- Library/Contributions/cmd/brew-test-bot.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Contributions/cmd/brew-test-bot.rb b/Library/Contributions/cmd/brew-test-bot.rb index d2d67cc6c8..11887cf7a4 100755 --- a/Library/Contributions/cmd/brew-test-bot.rb +++ b/Library/Contributions/cmd/brew-test-bot.rb @@ -433,8 +433,8 @@ if ARGV.include? '--ci-pr-upload' or ARGV.include? '--ci-testing-upload' system "git am --abort 2>/dev/null" system "git rebase --abort 2>/dev/null" - safe_system "git reset --hard" safe_system "git checkout -f master" + safe_system "git reset --hard origin/master" safe_system "brew update" if ARGV.include? '--ci-pr-upload'