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

Merge pull request #13655 from carlocab/pr-conflict-fix

Browse Source 
pr-pull: fix PRs conflicting with themselves
This commit is contained in:
Carlo Cabrera 2022-08-05 22:24:25 +08:00 committed by GitHub
commit ff9c250019
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,6 +373,8 @@ module Homebrew
"org:#{user}", repo: repo, state: "open", label: "\"no long build conflict\"" "org:#{user}", repo: repo, state: "open", label: "\"no long build conflict\""
).each_with_object({}) do |long_build_pr, hash| ).each_with_object({}) do |long_build_pr, hash|
number = long_build_pr["number"] number = long_build_pr["number"]
next if number == pr.to_i
GitHub.get_pull_request_changed_files("#{user}/#{repo}", number).each do |file| GitHub.get_pull_request_changed_files("#{user}/#{repo}", number).each do |file|
key = file["filename"] key = file["filename"]
hash[key] ||= [] hash[key] ||= []