From 026381d359ab0c10b25d6f90ecdc27771bb5e227 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 9 Dec 2020 13:01:35 +0000
Subject: [PATCH] Revert "untap: add --force switch"

---
 Library/Homebrew/cmd/untap.rb | 20 --------------------
 docs/Manpage.md               |  3 ---
 manpages/brew.1               |  4 ----
 3 files changed, 27 deletions(-)

diff --git a/Library/Homebrew/cmd/untap.rb b/Library/Homebrew/cmd/untap.rb
index 3d4c6f235e..b83667fed6 100644
--- a/Library/Homebrew/cmd/untap.rb
+++ b/Library/Homebrew/cmd/untap.rb
@@ -2,7 +2,6 @@
 # frozen_string_literal: true
 
 require "cli/parser"
-require "formula"
 
 module Homebrew
   extend T::Sig
@@ -17,8 +16,6 @@ module Homebrew
 
         Remove a tapped formula repository.
       EOS
-      switch "-f", "--force",
-             description: "Untap even if formulae or casks from this tap are currently installed."
 
       min_named 1
     end
@@ -31,23 +28,6 @@ module Homebrew
       tap = Tap.fetch(tapname)
       odie "Untapping #{tap} is not allowed" if tap.core_tap?
 
-      installed_tap_formulae = Formula.installed.select { |formula| formula.tap == tap }
-      installed_tap_casks = Cask::Caskroom.casks.select { |cask| cask.tap == tap }
-
-      if installed_tap_formulae.length.positive? || installed_tap_casks.length.positive?
-        if args.force?
-          opoo <<~EOS
-            Untapping #{tap} even though it contains the following installed formulae or casks:
-            #{(installed_tap_formulae + installed_tap_casks.map(&:token)).join("\n")}
-          EOS
-        else
-          odie <<~EOS
-            Refusing to untap #{tap} because it contains the following installed formulae or casks:
-            #{(installed_tap_formulae + installed_tap_casks.map(&:token)).join("\n")}
-          EOS
-        end
-      end
-
       tap.uninstall
     end
   end
diff --git a/docs/Manpage.md b/docs/Manpage.md
index a62fdef9c9..ceda2551d0 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -572,9 +572,6 @@ See also `pin`.
 
 Remove a tapped formula repository.
 
-* `-f`, `--force`:
-  Untap even if formulae or casks from this tap are currently installed.
-
 ### `update` [*`options`*]
 
 Fetch the newest version of Homebrew and all formulae from GitHub using `git`(1) and perform any necessary migrations.
diff --git a/manpages/brew.1 b/manpages/brew.1
index 336d3d920a..6e493e9fc1 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -770,10 +770,6 @@ Unpin \fIformula\fR, allowing them to be upgraded by \fBbrew upgrade\fR \fIformu
 .SS "\fBuntap\fR \fItap\fR"
 Remove a tapped formula repository\.
 .
-.TP
-\fB\-f\fR, \fB\-\-force\fR
-Untap even if formulae or casks from this tap are currently installed\.
-.
 .SS "\fBupdate\fR [\fIoptions\fR]"
 Fetch the newest version of Homebrew and all formulae from GitHub using \fBgit\fR(1) and perform any necessary migrations\.
 .