From 24fc15cf5639609dc3d8b7f2bcaf1a66795ee9c7 Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <psteinhardt@gitlab.com>
Date: Thu, 30 Jul 2020 09:15:06 +0200
Subject: [PATCH] Document new required minimum version of Git

Gitaly is moving its minimum required version of Git to v2.28.0. Adjust
our documentation to match.
---
 doc/install/installation.md         |  8 ++++----
 doc/install/requirements.md         |  3 +--
 doc/update/README.md                |  5 +++++
 doc/update/upgrading_from_source.md | 10 +++++-----
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/doc/install/installation.md b/doc/install/installation.md
index f444f29751435..b2da1e0eac927 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -134,7 +134,7 @@ Make sure you have the right version of Git installed:
 # Install Git
 sudo apt-get install -y git-core
 
-# Make sure Git is version 2.27.0 or higher (minimal supported version is 2.25.0)
+# Make sure Git is version 2.28.0 or higher
 git --version
 ```
 
@@ -181,9 +181,9 @@ sudo make install
 
 # Download and compile from source
 cd /tmp
-curl --remote-name --location --progress https://www.kernel.org/pub/software/scm/git/git-2.27.0.tar.gz
-echo '77ded85cbe42b1ffdc2578b460a1ef5d23bcbc6683eabcafbb0d394dffe2e787  git-2.27.0.tar.gz' | shasum -a256 -c - && tar -xzf git-2.27.0.tar.gz
-cd git-2.27.0/
+curl --remote-name --location --progress https://www.kernel.org/pub/software/scm/git/git-2.28.0.tar.gz
+echo 'f914c60a874d466c1e18467c864a910dd4ea22281ba6d4d58077cb0c3f115170  git-2.28.0.tar.gz' | shasum -a256 -c - && tar -xzf git-2.28.0.tar.gz
+cd git-2.28.0/
 ./configure --with-libpcre
 make prefix=/usr/local all
 
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index 25a81f9987b61..2587aaf18434f 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -56,8 +56,7 @@ The minimum required Go version is 1.13.
 
 From GitLab 13.1:
 
-- Git 2.25.x and later is required.
-- Git 2.27.x and later [is recommended](https://gitlab.com/gitlab-org/gitaly/-/issues/2829).
+- Git 2.28.x and later [is required](https://gitlab.com/gitlab-org/gitaly/-/issues/2959).
 
 ### Node.js versions
 
diff --git a/doc/update/README.md b/doc/update/README.md
index a82563bfefe1a..9dd2f1c51a2c4 100644
--- a/doc/update/README.md
+++ b/doc/update/README.md
@@ -222,6 +222,11 @@ possible.
 
 ## Version specific upgrading instructions
 
+### 13.3.0
+
+In 13.3.0, you must upgrade to at least Git v2.28. Previously, the minimum
+required version was Git v2.24.
+
 ### 13.2.0
 
 GitLab installations that have multiple web nodes will need to be
diff --git a/doc/update/upgrading_from_source.md b/doc/update/upgrading_from_source.md
index af461b93910ab..5fc4528e4c971 100644
--- a/doc/update/upgrading_from_source.md
+++ b/doc/update/upgrading_from_source.md
@@ -124,7 +124,7 @@ rm go1.13.5.linux-amd64.tar.gz
 
 CAUTION: **Caution:**
 From GitLab 13.1, you must use at least Git v2.24 (previous minimum version was v2.22).
-Git v2.26 is recommended.
+From GitLab 13.3, you must use at least Git v2.28.
 
 To check you are running the minimum required Git version, see
 [Git versions](../install/requirements.md#git-versions).
@@ -132,7 +132,7 @@ To check you are running the minimum required Git version, see
 In Debian or Ubuntu:
 
 ```shell
-# Make sure Git is version 2.24.0 or higher
+# Make sure Git is version 2.28.0 or higher
 git --version
 
 # Remove packaged Git
@@ -152,9 +152,9 @@ make install
 
 # Download and compile from source
 cd /tmp
-curl --remote-name --location --progress https://www.kernel.org/pub/software/scm/git/git-2.26.0.tar.gz
-echo 'aa168c2318e7187cd295a645f7370cc6d71a324aafc932f80f00c780b6a26bed  git-2.26.0.tar.gz' | shasum -a256 -c - && tar -xzf git-2.26.0.tar.gz
-cd git-2.26.0/
+curl --remote-name --location --progress https://www.kernel.org/pub/software/scm/git/git-2.28.0.tar.gz
+echo 'f914c60a874d466c1e18467c864a910dd4ea22281ba6d4d58077cb0c3f115170  git-2.28.0.tar.gz' | shasum -a256 -c - && tar -xzf git-2.28.0.tar.gz
+cd git-2.28.0/
 ./configure --with-libpcre
 make prefix=/usr/local all
 
-- 
GitLab