dev-cmd/pr-pull: fix branch warning conditions

This commit is contained in:
Bo Anderson 2023-07-22 22:41:51 +01:00
parent 3dcf3db07d
commit 9235024131
No known key found for this signature in database
GPG Key ID: 3DB94E204E137D65

View File

@ -432,7 +432,7 @@ module Homebrew
odie "Not a GitHub pull request: #{arg}" unless pr odie "Not a GitHub pull request: #{arg}" unless pr
git_repo = tap.git_repo git_repo = tap.git_repo
if !git_repo.default_origin_branch? || args.branch_okay? || args.clean? if !git_repo.default_origin_branch? && !args.branch_okay? && !args.no_commit? && !args.no_cherry_pick?
opoo "Current branch is #{git_repo.branch_name}: do you need to pull inside #{git_repo.origin_branch_name}?" opoo "Current branch is #{git_repo.branch_name}: do you need to pull inside #{git_repo.origin_branch_name}?"
end end