admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #711 from MikeMcQuaid/update-test-tweak

Browse Source 
update-test: tweak master not updated check.
This commit is contained in:
Mike McQuaid 2016-08-14 13:13:50 +01:00 committed by GitHub
commit 4111d29c81
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/dev-cmd/update-test.rb
View File

@ -15,7 +15,7 @@ module Homebrew
Utils.popen_read("git", "rev-list", "-n1", "--before=#{date}", "origin/master").chomp Utils.popen_read("git", "rev-list", "-n1", "--before=#{date}", "origin/master").chomp
else else
Utils.popen_read("git", "rev-parse", "origin/master").chomp Utils.popen_read("git", "rev-parse", "origin/master").chomp
end end
start_sha1 = Utils.popen_read("git", "rev-parse", start_sha1).chomp start_sha1 = Utils.popen_read("git", "rev-parse", start_sha1).chomp
end_sha1 = Utils.popen_read("git", "rev-parse", "HEAD").chomp end_sha1 = Utils.popen_read("git", "rev-parse", "HEAD").chomp
@ -49,7 +49,7 @@ module Homebrew
oh1 "Running brew update..." oh1 "Running brew update..."
safe_system "brew", "update", "--verbose" safe_system "brew", "update", "--verbose"
actual_end_sha1 = Utils.popen_read("git", "rev-parse", "master").chomp actual_end_sha1 = Utils.popen_read("git", "rev-parse", "master").chomp
if actual_end_sha1 != end_sha1 if start_sha1 != end_sha1 && start_sha1 == actual_end_sha1
raise <<-EOS.undent raise <<-EOS.undent
brew update didn't update master! brew update didn't update master!
Start commit: #{start_sha1} Start commit: #{start_sha1}