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

Use git merge-base to determine original_commit

Browse Source
This commit is contained in:
Carlo Cabrera 2023-03-20 00:55:20 +08:00
parent c669f1d625
commit e5b9e97b92
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/dev-cmd/pr-pull.rb
View File

@ -449,7 +449,13 @@ module Homebrew
ohai "Fetching #{tap} pull request ##{pr}" ohai "Fetching #{tap} pull request ##{pr}"
Dir.mktmpdir pr do |dir| Dir.mktmpdir pr do |dir|
cd dir do cd dir do
original_commit = ENV["GITHUB_SHA"].presence || tap.path.git_head current_branch_head = ENV["GITHUB_SHA"] || tap.git_head
original_commit = if args.no_cherry_pick?
# TODO: Handle the case where `merge-base` returns multiple commits.
Utils.safe_popen_read("git", "-C", tap.path, "merge-base", "origin/HEAD", current_branch_head).strip
else
current_branch_head
end
unless args.no_commit? unless args.no_commit?
cherry_pick_pr!(user, repo, pr, path: tap.path, args: args) unless args.no_cherry_pick? cherry_pick_pr!(user, repo, pr, path: tap.path, args: args) unless args.no_cherry_pick?
@ -460,13 +466,7 @@ module Homebrew
signoff!(tap.path, pr: pr, dry_run: args.dry_run?) unless args.clean? signoff!(tap.path, pr: pr, dry_run: args.dry_run?) unless args.clean?
end end
# TODO: Fix determination of `original_commit` above for the `--no-cherry-pick` flag. unless formulae_need_bottles?(tap, original_commit, user, repo, pr, args: args)
# When we pull to the PR branch that contains the commits we want to merge,
# `#formulae_need_bottles?` mistakenly returns `true`, because it thinks
# that no formulae have changed. We probably want to use the commit identified
# by `git merge-base`.
if !formulae_need_bottles?(tap, original_commit, user, repo, pr, args: args) &&
!args.no_cherry_pick?
ohai "Skipping artifacts for ##{pr} as the formulae don't need bottles" ohai "Skipping artifacts for ##{pr} as the formulae don't need bottles"
next next
end end