From 61544369e45234e3452eb2c21e67c43736aa08a1 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Fri, 5 Aug 2022 21:41:28 +0800 Subject: [PATCH 1/2] pr-pull: fix PRs conflicting with themselves https://github.com/Homebrew/homebrew-core/pull/106755#issuecomment-1206460655 --- Library/Homebrew/dev-cmd/pr-pull.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Library/Homebrew/dev-cmd/pr-pull.rb b/Library/Homebrew/dev-cmd/pr-pull.rb index eb9935f14a..c62cedbfb3 100644 --- a/Library/Homebrew/dev-cmd/pr-pull.rb +++ b/Library/Homebrew/dev-cmd/pr-pull.rb @@ -373,6 +373,8 @@ module Homebrew "org:#{user}", repo: repo, state: "open", label: "\"no long build conflict\"" ).each_with_object({}) do |long_build_pr, hash| number = long_build_pr["number"] + next if number == pr + GitHub.get_pull_request_changed_files("#{user}/#{repo}", number).each do |file| key = file["filename"] hash[key] ||= [] From a82974974cc9c16858c1d5bf50e25024d037ed22 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Fri, 5 Aug 2022 21:51:39 +0800 Subject: [PATCH 2/2] Update Library/Homebrew/dev-cmd/pr-pull.rb Co-authored-by: Bo Anderson --- Library/Homebrew/dev-cmd/pr-pull.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/pr-pull.rb b/Library/Homebrew/dev-cmd/pr-pull.rb index c62cedbfb3..9bac23c98c 100644 --- a/Library/Homebrew/dev-cmd/pr-pull.rb +++ b/Library/Homebrew/dev-cmd/pr-pull.rb @@ -373,7 +373,7 @@ module Homebrew "org:#{user}", repo: repo, state: "open", label: "\"no long build conflict\"" ).each_with_object({}) do |long_build_pr, hash| number = long_build_pr["number"] - next if number == pr + next if number == pr.to_i GitHub.get_pull_request_changed_files("#{user}/#{repo}", number).each do |file| key = file["filename"]