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

dev-cmd/pr-pull: don't cherry-pick on --no-commit

Browse Source
This commit is contained in:
Bo Anderson 2021-04-06 13:30:07 +01:00
parent 1d612fb0f0
commit 56b6918739
No known key found for this signature in database
GPG Key ID: 3DB94E204E137D65
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -391,18 +391,21 @@ 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 = tap.path.git_head original_commit = ENV["GITHUB_SHA"].presence || tap.path.git_head
cherry_pick_pr!(user, repo, pr, path: tap.path, args: args)
if args.autosquash? && !args.dry_run?
autosquash!(original_commit, path: tap.path,
verbose: args.verbose?, resolve: args.resolve?, reason: args.message)
end
signoff!(tap.path, pr: pr, dry_run: args.dry_run?) unless args.clean?
unless args.no_upload? unless args.no_commit?
mirror_formulae(tap, original_commit, cherry_pick_pr!(user, repo, pr, path: tap.path, args: args)
org: bintray_org, repo: mirror_repo, publish: !args.no_publish?, if args.autosquash? && !args.dry_run?
args: args) autosquash!(original_commit, path: tap.path,
verbose: args.verbose?, resolve: args.resolve?, reason: args.message)
end
signoff!(tap.path, pr: pr, dry_run: args.dry_run?) unless args.clean?
unless args.no_upload?
mirror_formulae(tap, original_commit,
org: bintray_org, repo: mirror_repo, publish: !args.no_publish?,
args: args)
end
end end
unless formulae_need_bottles?(tap, original_commit, user, repo, pr, args: args) unless formulae_need_bottles?(tap, original_commit, user, repo, pr, args: args)