diff options
| author | Mike McQuaid | 2014-01-31 19:12:41 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2014-01-31 19:12:41 +0100 |
| commit | 18730f835d6bc54068b44a9e0064a87a36c9944a (patch) | |
| tree | f094a3222d43f8e7c2cd93f966f0f7e5cb7bfe19 /Library | |
| parent | d83ed0d793210bd692fe72830b8f3c0b0f41f5ab (diff) | |
| download | brew-18730f835d6bc54068b44a9e0064a87a36c9944a.tar.bz2 | |
brew-test-bot: reset to origin for bottle upload.
Diffstat (limited to 'Library')
| -rwxr-xr-x | Library/Contributions/cmd/brew-test-bot.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Library/Contributions/cmd/brew-test-bot.rb b/Library/Contributions/cmd/brew-test-bot.rb index d2d67cc6c..11887cf7a 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' |