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

dev-cmd/pr-pull: use git_extensions

Browse Source
This commit is contained in:
Jonathan Chang 2020-11-27 18:41:40 +11:00
parent 75be0ca4d0
commit 5bda84b594
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,7 +216,8 @@ module Homebrew
end end
def autosquash!(original_commit, path: ".", reason: "", verbose: false, resolve: false) def autosquash!(original_commit, path: ".", reason: "", verbose: false, resolve: false)
original_head = Utils.safe_popen_read("git", "-C", path, "rev-parse", "HEAD").strip path = Pathname(path).extend(GitRepositoryExtension)
original_head = path.git_head
commits = Utils.safe_popen_read("git", "-C", path, "rev-list", commits = Utils.safe_popen_read("git", "-C", path, "rev-list",
"--reverse", "#{original_commit}..HEAD").lines.map(&:strip) "--reverse", "#{original_commit}..HEAD").lines.map(&:strip)
@ -394,7 +395,7 @@ 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 = Utils.popen_read("git", "-C", tap.path, "rev-parse", "HEAD").chomp original_commit = tap.path.git_head
cherry_pick_pr!(user, repo, pr, path: tap.path, args: args) cherry_pick_pr!(user, repo, pr, path: tap.path, args: args)
if args.autosquash? && !args.dry_run? if args.autosquash? && !args.dry_run?
autosquash!(original_commit, path: tap.path, autosquash!(original_commit, path: tap.path,

2
Library/Homebrew/test/dev-cmd/pr-pull_spec.rb
View File

@ -58,7 +58,7 @@ describe Homebrew do
safe_system Utils::Git.git, "commit", formula_file, "-m", "revision" safe_system Utils::Git.git, "commit", formula_file, "-m", "revision"
File.open(formula_file, "w") { |f| f.write(formula_version) } File.open(formula_file, "w") { |f| f.write(formula_version) }
safe_system Utils::Git.git, "commit", formula_file, "-m", "version", "--author=#{secondary_author}" safe_system Utils::Git.git, "commit", formula_file, "-m", "version", "--author=#{secondary_author}"
described_class.autosquash!(original_hash, path: ".") described_class.autosquash!(original_hash, path: path)
expect(Utils::Git.commit_message(path)).to include("foo 2.0") expect(Utils::Git.commit_message(path)).to include("foo 2.0")
expect(Utils::Git.commit_message(path)).to include("Co-authored-by: #{secondary_author}") expect(Utils::Git.commit_message(path)).to include("Co-authored-by: #{secondary_author}")
end end