From bd0346e083a62380427500883e148a8eab5ff8fe Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sun, 26 Jul 2020 09:44:26 +0200 Subject: [PATCH] Pass `args` in `pr-automerge` instead of using global `args`. --- Library/Homebrew/dev-cmd/pr-automerge.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/dev-cmd/pr-automerge.rb b/Library/Homebrew/dev-cmd/pr-automerge.rb index 43d96af0ff..62c6db0395 100644 --- a/Library/Homebrew/dev-cmd/pr-automerge.rb +++ b/Library/Homebrew/dev-cmd/pr-automerge.rb @@ -32,15 +32,15 @@ module Homebrew end def pr_automerge - pr_automerge_args.parse + args = pr_automerge_args.parse - without_labels = Homebrew.args.without_labels || ["do not merge", "new formula"] - tap = Tap.fetch(Homebrew.args.tap || CoreTap.instance.name) + without_labels = args.without_labels || ["do not merge", "new formula"] + tap = Tap.fetch(args.tap || CoreTap.instance.name) query = "is:pr is:open repo:#{tap.full_name}" - query += Homebrew.args.ignore_failures? ? " -status:pending" : " status:success" - query += " review:approved" unless Homebrew.args.without_approval? - query += " label:\"#{args.with_label}\"" if Homebrew.args.with_label + query += args.ignore_failures? ? " -status:pending" : " status:success" + query += " review:approved" unless args.without_approval? + query += " label:\"#{args.with_label}\"" if args.with_label without_labels&.each { |label| query += " -label:\"#{label}\"" } odebug "Searching: #{query}"