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

Merge pull request #7634 from zmwangx/bump-formula-pr-fix-formula-guessing

Browse Source 
bump-formula-pr: fix forking error when formula is guessed from url
This commit is contained in:
Mike McQuaid 2020-05-23 13:10:21 +01:00 committed by GitHub
commit e9d45a6692
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/dev-cmd/bump-formula-pr.rb
View File

@ -118,12 +118,6 @@ module Homebrew
formula = args.formulae.first formula = args.formulae.first
if formula
tap_full_name, origin_branch, previous_branch = use_correct_linux_tap(formula)
check_for_duplicate_pull_requests(formula, tap_full_name)
checked_for_duplicates = true
end
new_url = args.url new_url = args.url
if new_url && !formula if new_url && !formula
# Split the new URL on / and find any formulae that have the same URL # Split the new URL on / and find any formulae that have the same URL
@ -152,7 +146,8 @@ module Homebrew
end end
raise FormulaUnspecifiedError unless formula raise FormulaUnspecifiedError unless formula
check_for_duplicate_pull_requests(formula, tap_full_name) unless checked_for_duplicates tap_full_name, origin_branch, previous_branch = use_correct_linux_tap(formula)
check_for_duplicate_pull_requests(formula, tap_full_name)
requested_spec, formula_spec = if args.devel? requested_spec, formula_spec = if args.devel?
devel_message = " (devel)" devel_message = " (devel)"