From a0f915169c72b3df20ed1d6defe1edac2ad1cbd3 Mon Sep 17 00:00:00 2001
From: Ian Gregory <justcheesy@outlook.com>
Date: Tue, 25 Oct 2022 19:07:21 -0400
Subject: [PATCH] Remove `--adopt` switch from `reinstall` and `upgrade`

---
 Library/Homebrew/cask/cmd/reinstall.rb |  3 ---
 Library/Homebrew/cask/cmd/upgrade.rb   | 11 ++---------
 Library/Homebrew/cmd/reinstall.rb      |  1 -
 Library/Homebrew/cmd/upgrade.rb        |  2 --
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/Library/Homebrew/cask/cmd/reinstall.rb b/Library/Homebrew/cask/cmd/reinstall.rb
index ee7040a411..9637805450 100644
--- a/Library/Homebrew/cask/cmd/reinstall.rb
+++ b/Library/Homebrew/cask/cmd/reinstall.rb
@@ -16,7 +16,6 @@ module Cask
           binaries:       args.binaries?,
           verbose:        args.verbose?,
           force:          args.force?,
-          adopt:          args.adopt?,
           skip_cask_deps: args.skip_cask_deps?,
           require_sha:    args.require_sha?,
           quarantine:     args.quarantine?,
@@ -28,7 +27,6 @@ module Cask
         *casks,
         verbose: nil,
         force: nil,
-        adopt: nil,
         skip_cask_deps: nil,
         binaries: nil,
         require_sha: nil,
@@ -41,7 +39,6 @@ module Cask
           binaries:       binaries,
           verbose:        verbose,
           force:          force,
-          adopt:          adopt,
           skip_cask_deps: skip_cask_deps,
           require_sha:    require_sha,
           quarantine:     quarantine,
diff --git a/Library/Homebrew/cask/cmd/upgrade.rb b/Library/Homebrew/cask/cmd/upgrade.rb
index b1ca718c93..a96275cbe2 100644
--- a/Library/Homebrew/cask/cmd/upgrade.rb
+++ b/Library/Homebrew/cask/cmd/upgrade.rb
@@ -13,10 +13,6 @@ module Cask
       extend T::Sig
 
       OPTIONS = [
-        [:switch, "--adopt", {
-          description: "Adopt existing artifacts in the destination that are identical to those being installed. " \
-                       "Cannot be combined with --force.",
-        }],
         [:switch, "--skip-cask-deps", {
           description: "Skip installing cask dependencies.",
         }],
@@ -70,7 +66,6 @@ module Cask
           casks:               Cask,
           args:                Homebrew::CLI::Args,
           force:               T.nilable(T::Boolean),
-          adopt:               T.nilable(T::Boolean),
           greedy:              T.nilable(T::Boolean),
           greedy_latest:       T.nilable(T::Boolean),
           greedy_auto_updates: T.nilable(T::Boolean),
@@ -86,7 +81,6 @@ module Cask
         *casks,
         args:,
         force: false,
-        adopt: false,
         greedy: false,
         greedy_latest: false,
         greedy_auto_updates: false,
@@ -162,7 +156,7 @@ module Cask
         upgradable_casks.each do |(old_cask, new_cask)|
           upgrade_cask(
             old_cask, new_cask,
-            binaries: binaries, force: force, adopt: adopt, skip_cask_deps: skip_cask_deps, verbose: verbose,
+            binaries: binaries, force: force, skip_cask_deps: skip_cask_deps, verbose: verbose,
             quarantine: quarantine, require_sha: require_sha
           )
         rescue => e
@@ -177,7 +171,7 @@ module Cask
 
       def self.upgrade_cask(
         old_cask, new_cask,
-        binaries:, force:, adopt:, quarantine:, require_sha:, skip_cask_deps:, verbose:
+        binaries:, force:, quarantine:, require_sha:, skip_cask_deps:, verbose:
       )
         require "cask/installer"
 
@@ -201,7 +195,6 @@ module Cask
           binaries:       binaries,
           verbose:        verbose,
           force:          force,
-          adopt:          adopt,
           skip_cask_deps: skip_cask_deps,
           require_sha:    require_sha,
           upgrade:        true,
diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb
index b6c7ea9f0f..863f8162db 100644
--- a/Library/Homebrew/cmd/reinstall.rb
+++ b/Library/Homebrew/cmd/reinstall.rb
@@ -152,7 +152,6 @@ module Homebrew
         binaries:       args.binaries?,
         verbose:        args.verbose?,
         force:          args.force?,
-        adopt:          args.adopt?,
         require_sha:    args.require_sha?,
         skip_cask_deps: args.skip_cask_deps?,
         quarantine:     args.quarantine?,
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index b79e52a8f8..e33b3cab0b 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -97,7 +97,6 @@ module Homebrew
       cask_options
 
       conflicts "--build-from-source", "--force-bottle"
-      conflicts "--adopt", "--force"
 
       named_args [:outdated_formula, :outdated_cask]
     end
@@ -227,7 +226,6 @@ module Homebrew
     Cask::Cmd::Upgrade.upgrade_casks(
       *casks,
       force:               args.force?,
-      adopt:               args.adopt?,
       greedy:              args.greedy?,
       greedy_latest:       args.greedy_latest?,
       greedy_auto_updates: args.greedy_auto_updates?,