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

Merge pull request #15736 from Bo98/pr-pull-branch-warn-fix

Browse Source
This commit is contained in:
Mike McQuaid 2023-07-24 08:35:29 +01:00 committed by GitHub
commit 3980bc9c1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 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

@ -432,7 +432,7 @@ module Homebrew
odie "Not a GitHub pull request: #{arg}" unless pr
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}?"
end