aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/dev-cmd/update-test.rb
diff options
context:
space:
mode:
authorMike McQuaid2016-09-16 17:17:50 +0100
committerMike McQuaid2016-09-16 17:17:50 +0100
commit1649545cf92753732cd22ed909f58b910be01ae4 (patch)
tree6c5c64e9613b5f22c352d9ca0872dfcedd28d89d /Library/Homebrew/dev-cmd/update-test.rb
parent53713593d677cb916402742940d14bfc7e60a5a4 (diff)
downloadbrew-1649545cf92753732cd22ed909f58b910be01ae4.tar.bz2
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.
Diffstat (limited to 'Library/Homebrew/dev-cmd/update-test.rb')
-rw-r--r--Library/Homebrew/dev-cmd/update-test.rb3
1 files changed, 1 insertions, 2 deletions
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