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

dev-cmd/update-test: test against merge-base rather than latest master

Browse Source
This commit is contained in:
Bo Anderson 2022-07-12 19:30:52 +01:00
parent 0c785673d9
commit 676b88c5c4
No known key found for this signature in database
GPG Key ID: 3DB94E204E137D65
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,8 @@ module Homebrew
"master" "master"
end end
start_commit, end_commit = nil start_commit = nil
end_commit = "HEAD"
cd HOMEBREW_REPOSITORY do cd HOMEBREW_REPOSITORY do
start_commit = if (commit = args.commit) start_commit = if (commit = args.commit)
commit commit
@ -79,14 +80,13 @@ module Homebrew
# ^0 ensures this points to the commit rather than the tag object. # ^0 ensures this points to the commit rather than the tag object.
"#{previous_tag}^0" "#{previous_tag}^0"
else else
Utils.popen_read("git", "rev-parse", "origin/master").chomp Utils.popen_read("git", "merge-base", "origin/master", end_commit).chomp
end end
odie "Could not find start commit!" if start_commit.empty? odie "Could not find start commit!" if start_commit.empty?
start_commit = Utils.popen_read("git", "rev-parse", start_commit).chomp start_commit = Utils.popen_read("git", "rev-parse", start_commit).chomp
odie "Could not find start commit!" if start_commit.empty? odie "Could not find start commit!" if start_commit.empty?
end_commit ||= "HEAD"
end_commit = Utils.popen_read("git", "rev-parse", end_commit).chomp end_commit = Utils.popen_read("git", "rev-parse", end_commit).chomp
odie "Could not find end commit!" if end_commit.empty? odie "Could not find end commit!" if end_commit.empty?