mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

dev-cmd/pr-pull: handle non-cherry-picked commits in #autosquash!

Browse Source
This commit is contained in:
Carlo Cabrera 2023-03-29 17:11:51 +08:00
parent ad6d05ba40
commit 1ed8b3db2f
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,7 +226,8 @@ module Homebrew
ohai bump_subject ohai bump_subject
end end
def self.autosquash!(original_commit, tap:, reason: "", verbose: false, resolve: false) # TODO: fix test in `test/dev-cmd/pr-pull_spec.rb` and assume `cherry_picked: false`.
def self.autosquash!(original_commit, tap:, reason: "", verbose: false, resolve: false, cherry_picked: true)
original_head = tap.path.git_head original_head = tap.path.git_head
commits = Utils.safe_popen_read("git", "-C", tap.path, "rev-list", commits = Utils.safe_popen_read("git", "-C", tap.path, "rev-list",
@ -285,9 +286,9 @@ module Homebrew
end end
end end
rescue rescue
opoo "Autosquash encountered an error; resetting to original cherry-picked state at #{original_head}" opoo "Autosquash encountered an error; resetting to original state at #{original_head}"
system "git", "-C", tap.path, "reset", "--hard", original_head system "git", "-C", tap.path, "reset", "--hard", original_head
system "git", "-C", tap.path, "cherry-pick", "--abort" system "git", "-C", tap.path, "cherry-pick", "--abort" if cherry_picked
raise raise
end end
@ -474,7 +475,7 @@ module Homebrew
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?
if args.autosquash? && !args.dry_run? if args.autosquash? && !args.dry_run?
autosquash!(original_commit, tap: tap, autosquash!(original_commit, tap: tap, cherry_picked: !args.no_cherry_pick?,
verbose: args.verbose?, resolve: args.resolve?, reason: args.message) verbose: args.verbose?, resolve: args.resolve?, reason: args.message)
end end
signoff!(tap.path, pull_request: pr, dry_run: args.dry_run?) unless args.clean? signoff!(tap.path, pull_request: pr, dry_run: args.dry_run?) unless args.clean?