From 2688a6d88d61066268c19b51c835fcc1a8a9a43c Mon Sep 17 00:00:00 2001
From: Waylan Limberg <waylan.limberg@icloud.com>
Date: Mon, 7 Jun 2021 10:52:36 -0400
Subject: [PATCH] Ensure gh-deploy always pushes

This was a regression in behavior. I had missed that `push` and `force`
are two separate parameters of `ghp_import.ghp_import` in #2257.
---
 docs/about/release-notes.md  | 4 ++++
 mkdocs/__init__.py           | 2 +-
 mkdocs/commands/gh_deploy.py | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/about/release-notes.md b/docs/about/release-notes.md
index 137bb9d3..4855f1dc 100644
--- a/docs/about/release-notes.md
+++ b/docs/about/release-notes.md
@@ -21,6 +21,10 @@ The current and past members of the MkDocs team.
 * [@d0ugal](https://github.com/d0ugal/)
 * [@waylan](https://github.com/waylan/)
 
+## Version 1.2.1 (Under Development)
+
+* Bugfix: Ensure 'gh-deploy' always pushes.
+
 ## Version 1.2 (2021-06-04)
 
 ### Major Additions to Version 1.2
diff --git a/mkdocs/__init__.py b/mkdocs/__init__.py
index ce5995e1..b9e0aa8b 100644
--- a/mkdocs/__init__.py
+++ b/mkdocs/__init__.py
@@ -2,4 +2,4 @@
 
 
 # For acceptable version formats, see https://www.python.org/dev/peps/pep-0440/
-__version__ = '1.2'
+__version__ = '1.2.1.dev1'
diff --git a/mkdocs/commands/gh_deploy.py b/mkdocs/commands/gh_deploy.py
index 0cb1217d..95ef3bb0 100644
--- a/mkdocs/commands/gh_deploy.py
+++ b/mkdocs/commands/gh_deploy.py
@@ -110,7 +110,8 @@ def gh_deploy(config, message=None, force=False, ignore_version=False, shell=Fal
             mesg=message,
             remote=remote_name,
             branch=remote_branch,
-            push=force,
+            push=True,
+            force=force,
             use_shell=shell,
             nojekyll=True
         )