From 3325b79726c39f10e69339f7009de3ff921ad117 Mon Sep 17 00:00:00 2001
From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
Date: Sun, 18 Jul 2021 15:36:19 +0800
Subject: [PATCH] dev-cmd/pr-automerge: deprecate `--autosquash`

---
 Library/Homebrew/dev-cmd/pr-automerge.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/dev-cmd/pr-automerge.rb b/Library/Homebrew/dev-cmd/pr-automerge.rb
index 5f58d20d02..2b32850333 100644
--- a/Library/Homebrew/dev-cmd/pr-automerge.rb
+++ b/Library/Homebrew/dev-cmd/pr-automerge.rb
@@ -30,6 +30,9 @@ module Homebrew
       switch "--autosquash",
              description: "Instruct `brew pr-publish` to automatically reformat and reword commits "\
                           "in the pull request to our preferred format."
+      switch "--no_autosquash",
+             description: "Instruct `brew pr-publish` to skip automatically reformattin and rewording commits "\
+                          "in the pull request to the preferred format."
       switch "--ignore-failures",
              description: "Include pull requests that have failing status checks."
 
@@ -40,6 +43,8 @@ module Homebrew
   def pr_automerge
     args = pr_automerge_args.parse
 
+    odeprecated "`brew pr-publish --autosquash`" if args.autosquash?
+
     without_labels = args.without_labels || [
       "do not merge",
       "new formula",
@@ -71,7 +76,7 @@ module Homebrew
 
     publish_args = ["pr-publish"]
     publish_args << "--tap=#{tap}" if tap
-    publish_args << "--autosquash" if args.autosquash?
+    publish_args << "--autosquash" unless args.no_autosquash?
     if args.publish?
       safe_system HOMEBREW_BREW_FILE, *publish_args, *pr_urls
     else