diff options
Diffstat (limited to 'Library/Homebrew/dev-cmd')
| -rw-r--r-- | Library/Homebrew/dev-cmd/update-test.rb | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/Library/Homebrew/dev-cmd/update-test.rb b/Library/Homebrew/dev-cmd/update-test.rb index 7263c9ca9..2285dafd0 100644 --- a/Library/Homebrew/dev-cmd/update-test.rb +++ b/Library/Homebrew/dev-cmd/update-test.rb @@ -2,26 +2,33 @@ require "extend/ENV" module Homebrew def update_test - homebrew_repository_git = HOMEBREW_REPOSITORY/".git" - mktemp do curdir = Pathname.new(Dir.pwd) - ohai "Setup test environment..." + oh1 "Setup test environment..." # copy Homebrew installation - cp_r homebrew_repository_git, curdir/".git" + cp_r HOMEBREW_REPOSITORY/".git", curdir/".git" + start_sha1 = Utils.popen_read("git", "rev-parse", "origin/master").chomp + end_sha1 = Utils.popen_read("git", "rev-parse", "HEAD").chomp + + # set git origin to another copy + cp_r HOMEBREW_REPOSITORY/".git", curdir/"remote.git" + safe_system "git", "config", "remote.origin.url", "file://#{curdir}/remote.git" + + # force push origin to end_sha1 safe_system "git", "checkout", "--force", "master" - safe_system "git", "reset", "--hard", "origin/master" + safe_system "git", "reset", "--hard", end_sha1 + safe_system "git", "push", "--force", "origin", "master" - # set git origin - safe_system "git", "config", "remote.origin.url", "file://#{homebrew_repository_git}" + # set test copy to start_sha1 + safe_system "git", "reset", "--hard", start_sha1 # update ENV["PATH"] ENV.extend(Stdenv) ENV.prepend_path "PATH", "#{curdir}/bin" # run brew update - ohai "Running brew update..." + oh1 "Running brew update..." safe_system "brew", "update", "--verbose" end end |