From ba697d43d8003f7b018282b9adbc47f719416d36 Mon Sep 17 00:00:00 2001
From: Christian Couder <chriscool@tuxfamily.org>
Date: Fri, 27 Mar 2020 10:09:58 +0100
Subject: [PATCH] Upgrade to Git 2.26

Git 2.26.0 has been released and it contains patches that we
manually added to Git 2.24, see:

https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/3896
https://gitlab.com/gitlab-org/git/issues/7

Part of: https://gitlab.com/gitlab-org/gitaly/-/issues/2497
---
 .gitlab-ci.yml              | 62 ++++++++++++++++++-------------------
 scripts/custom-docker-build |  4 +++
 2 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f557792..dd7a0f7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,30 +67,30 @@ before_script:
 node-10 test: *test_custom
 
 # Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
-ruby-2.6-golang-1.13-git-2.21 test: *test_custom
-ruby-2.6-golang-1.12-git-2.22 test: *test_custom
-ruby-2.6-golang-1.13-git-2.22 test: *test_custom
 ruby-2.6-golang-1.12-git-2.24 test: *test_custom
 ruby-2.6-golang-1.13-git-2.24 test: *test_custom
 ruby-2.6-golang-1.14-git-2.24 test: *test_custom
+ruby-2.6-golang-1.12-git-2.26 test: *test_custom
+ruby-2.6-golang-1.13-git-2.26 test: *test_custom
+ruby-2.6-golang-1.14-git-2.26 test: *test_custom
 
 # Used by GitLab: https://gitlab.com/gitlab-org/gitlab/blob/master/.gitlab-ci.yml
-ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34 test: *test_custom
-ruby-2.6.3-golang-1.12-git-2.22-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34 test: *test_custom
-ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34 test: *test_custom
-ruby-2.6.3-golang-1.12-git-2.22-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34 test: *test_custom
-ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34 test: *test_custom
-ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34 test: *test_custom
-ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34 test: *test_custom
-ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34 test: *test_custom
+ruby-2.6.3-golang-1.12-git-2.24-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34 test: *test_custom
+ruby-2.6.3-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34 test: *test_custom
+ruby-2.6.3-golang-1.12-git-2.24-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34 test: *test_custom
+ruby-2.6.3-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34 test: *test_custom
+ruby-2.6.3-golang-1.12-git-2.24-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34 test: *test_custom
+ruby-2.6.5-golang-1.12-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34 test: *test_custom
+ruby-2.6.5-golang-1.12-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34 test: *test_custom
+ruby-2.6.5-golang-1.12-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34 test: *test_custom
 
 # gitlab:assets:compile step
-ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1 test: *test_custom
-ruby-2.6.3-git-2.22-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1 test: *test_custom
-ruby-2.6.5-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1 test: *test_custom
+ruby-2.6.3-git-2.24-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1 test: *test_custom
+ruby-2.6.3-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1 test: *test_custom
+ruby-2.6.5-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1 test: *test_custom
 
 # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
-ruby-2.6.5-git-2.22-chrome-74.0-node-12.x-yarn-1.21-docker-19.03.1 test: *test_custom
+ruby-2.6.5-git-2.24-chrome-74.0-node-12.x-yarn-1.21-docker-19.03.1 test: *test_custom
 
 # Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
 ruby-2.3-ansible-2.5.1-terraform-0.11 test: *test_custom
@@ -131,30 +131,30 @@ golangci-lint-alpine test: *test_build
 node-10: *build_and_deploy_custom
 
 # Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
-ruby-2.6-golang-1.13-git-2.21: *build_and_deploy_custom
-ruby-2.6-golang-1.12-git-2.22: *build_and_deploy_custom
 ruby-2.6-golang-1.13-git-2.22: *build_and_deploy_custom
 ruby-2.6-golang-1.12-git-2.24: *build_and_deploy_custom
 ruby-2.6-golang-1.13-git-2.24: *build_and_deploy_custom
-ruby-2.6-golang-1.14-git-2.24: *build_and_deploy_custom
+ruby-2.6-golang-1.12-git-2.26: *build_and_deploy_custom
+ruby-2.6-golang-1.13-git-2.26: *build_and_deploy_custom
+ruby-2.6-golang-1.14-git-2.26: *build_and_deploy_custom
 
 # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
-ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34: *build_and_deploy_custom
-ruby-2.6.3-golang-1.12-git-2.22-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34: *build_and_deploy_custom
-ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34: *build_and_deploy_custom
-ruby-2.6.3-golang-1.12-git-2.22-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34: *build_and_deploy_custom
-ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom
-ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34: *build_and_deploy_custom
-ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34: *build_and_deploy_custom
-ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom
+ruby-2.6.3-golang-1.12-git-2.24-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34: *build_and_deploy_custom
+ruby-2.6.3-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34: *build_and_deploy_custom
+ruby-2.6.3-golang-1.12-git-2.24-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34: *build_and_deploy_custom
+ruby-2.6.3-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34: *build_and_deploy_custom
+ruby-2.6.3-golang-1.12-git-2.24-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom
+ruby-2.6.5-golang-1.12-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34: *build_and_deploy_custom
+ruby-2.6.5-golang-1.12-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-10-graphicsmagick-1.3.34: *build_and_deploy_custom
+ruby-2.6.5-golang-1.12-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom
 
 # gitlab:assets:compile step
-ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1: *build_and_deploy_custom
-ruby-2.6.3-git-2.22-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1: *build_and_deploy_custom
-ruby-2.6.5-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1: *build_and_deploy_custom
+ruby-2.6.3-git-2.24-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1: *build_and_deploy_custom
+ruby-2.6.3-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1: *build_and_deploy_custom
+ruby-2.6.5-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-graphicsmagick-1.3.34-docker-19.03.1: *build_and_deploy_custom
 
 # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
-ruby-2.6.5-git-2.22-chrome-74.0-node-12.x-yarn-1.21-docker-19.03.1: *build_and_deploy_custom
+ruby-2.6.5-git-2.24-chrome-74.0-node-12.x-yarn-1.21-docker-19.03.1: *build_and_deploy_custom
 
 # Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
 ruby-2.3-ansible-2.5.1-terraform-0.11: *build_and_deploy_custom
@@ -200,7 +200,7 @@ cache-google-chrome:
 
 # Old Google Chrome images are listed here for reference:
 
-# These still exist in our docker repisotiry, but they cannot be built anymore since
+# These still exist in our docker repository, but they cannot be built anymore since
 # Google yanks them from their PPA.  To build variations of these requires an image based on
 # one of the images below.
 
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index e4f46ed..36c07d1 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -73,6 +73,10 @@ function print_git_args() {
             GIT_VERSION=2.24.1
             GIT_DOWNLOAD_SHA256=ad5334956301c86841eb1e5b1bb20884a6bad89a10a6762c958220c7cf64da02
             ;;
+        2.26)
+            GIT_VERSION=2.26.0
+            GIT_DOWNLOAD_SHA256=aa168c2318e7187cd295a645f7370cc6d71a324aafc932f80f00c780b6a26bed
+            ;;
         *) echo "Unknown git version $1"; exit 1;
     esac