From 1649545cf92753732cd22ed909f58b910be01ae4 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 16 Sep 2016 17:17:50 +0100 Subject: update-test: handle missing master branch. Ensure it's always created. Also, re-order `update-test` in `test-bot` (and `readall`) so they are run before the test suites. --- Library/Homebrew/dev-cmd/update-test.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Library/Homebrew/dev-cmd/update-test.rb') diff --git a/Library/Homebrew/dev-cmd/update-test.rb b/Library/Homebrew/dev-cmd/update-test.rb index fe0b1bf4d..bcf8020e4 100644 --- a/Library/Homebrew/dev-cmd/update-test.rb +++ b/Library/Homebrew/dev-cmd/update-test.rb @@ -40,8 +40,7 @@ module Homebrew safe_system "git", "config", "remote.origin.url", "#{curdir}/remote.git" # force push origin to end_sha1 - safe_system "git", "checkout", "--force", "master" - safe_system "git", "reset", "--hard", end_sha1 + safe_system "git", "checkout", "-B", "master", end_sha1 safe_system "git", "push", "--force", "origin", "master" # set test copy to start_sha1 -- cgit v1.2.3