build-bottle-pr: fix --force option detection

Homebrew/brew#6939
dawidd6 · Jan 17, 2020 · de55c2b · de55c2b
1 parent c07ced5
commit de55c2b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cmd/brew-build-bottle-pr.rb b/cmd/brew-build-bottle-pr.rb
@@ -64,7 +64,7 @@ def build_bottle(formula)
       return odie "#{formula}: PR already exists" if hub_pr_already_opened?(title)
 
       unless Utils.popen_read("git", "branch", "--list", branch).empty?
-        return odie "#{formula}: Branch #{branch} already exists" unless ARGV.force?
+        return odie "#{formula}: Branch #{branch} already exists" unless ARGV.include? "--force"
 
         ohai "#{formula}: Removing branch #{branch} in #{tap_dir}" if ARGV.verbose?
         safe_system "git", "branch", "-D", branch
@@ -78,7 +78,7 @@ def build_bottle(formula)
       if ARGV.value("dry_run").nil?
         safe_system "git", "commit", formula_path, "-m", title
         unless Utils.popen_read("git", "branch", "-r", "--list", "#{remote}/#{branch}").empty?
-          return odie "#{formula}: Remote branch #{remote}/#{branch} already exists" unless ARGV.force?
+          return odie "#{formula}: Remote branch #{remote}/#{branch} already exists" unless ARGV.include? "--force"
 
           ohai "#{formula}: Removing branch #{branch} from #{remote}" if ARGV.verbose?
           safe_system "git", "push", "--delete", remote, branch