From 472516a1803e7f48ec6f253905c6c7768fbd7010 Mon Sep 17 00:00:00 2001
From: Pavlo Strokov <pstrokov@gitlab.com>
Date: Wed, 11 Dec 2019 11:26:22 +0000
Subject: [PATCH] Upgrade to Git 2.24

Git 2.24.1 has been released and it contains a bug fixes that unblock
https://gitlab.com/gitlab-org/gitlab/issues/27828, and means
that we can more easily ship a custom version of Git with
https://gitlab.com/chriscool's patch
https://gitlab.com/gitlab-org/git/issues/7

Part of: https://gitlab.com/gitlab-org/gitaly/issues/2170
---
 scripts/custom-docker-build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index b171f4f..05225c1 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -60,6 +60,7 @@ function print_chrome_args() {
     printf -- "--build-arg CHROME_DRIVER_VERSION=%s " "$CHROME_DRIVER_VERSION"
 }
 
+# see https://www.kernel.org/pub/software/scm/git
 function print_git_args() {
     case "$1" in
         2.18)
@@ -75,8 +76,8 @@ function print_git_args() {
             GIT_DOWNLOAD_SHA256=a4b7e4365bee43caa12a38d646d2c93743d755d1cea5eab448ffb40906c9da0b
             ;;
         2.24)
-            GIT_VERSION=2.24.0
-            GIT_DOWNLOAD_SHA256=ad11030d2eac656ee9e8862f56d1610550f7867181beff814c7712a99192e99d
+            GIT_VERSION=2.24.1
+            GIT_DOWNLOAD_SHA256=ad5334956301c86841eb1e5b1bb20884a6bad89a10a6762c958220c7cf64da02
             ;;
         *) echo "Unknown git version $1"; exit 1;
     esac