From 56b6918739d4b31fab9938c1d30b2ce2d263703a Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Tue, 6 Apr 2021 13:30:07 +0100 Subject: [PATCH] dev-cmd/pr-pull: don't cherry-pick on --no-commit --- Library/Homebrew/dev-cmd/pr-pull.rb | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/Library/Homebrew/dev-cmd/pr-pull.rb b/Library/Homebrew/dev-cmd/pr-pull.rb index bfa1962d39..e55e2afa31 100644 --- a/Library/Homebrew/dev-cmd/pr-pull.rb +++ b/Library/Homebrew/dev-cmd/pr-pull.rb @@ -391,18 +391,21 @@ module Homebrew ohai "Fetching #{tap} pull request ##{pr}" Dir.mktmpdir pr do |dir| cd dir do - original_commit = 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? + original_commit = ENV["GITHUB_SHA"].presence || tap.path.git_head - unless args.no_upload? - mirror_formulae(tap, original_commit, - org: bintray_org, repo: mirror_repo, publish: !args.no_publish?, - args: args) + unless args.no_commit? + 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? + mirror_formulae(tap, original_commit, + org: bintray_org, repo: mirror_repo, publish: !args.no_publish?, + args: args) + end end unless formulae_need_bottles?(tap, original_commit, user, repo, pr, args: args)