From 3e75b17a99d90e90cb3e18e2b115c9305ed7795b Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Mon, 20 Jul 2020 14:00:29 +0200
Subject: [PATCH] Upgrade to Git v2.28.0.rc1

Git v2.28.0.rc1 has been released. As the v2.28.0 release series is the
first to contain support for the reference-transaction hook which is
currently a focus for Gitaly, this commit adds the release candidate
version so we can test the hook as part of Gitaly's CI.
---
 .gitlab-ci.yml              |  2 ++
 Dockerfile.custom           |  2 +-
 scripts/custom-docker-build | 12 ++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a10d3e..3182e48 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,6 +67,8 @@ ruby-2.6-golang-1.14-git-2.25 test: *test_custom
 ruby-2.6-golang-1.14-git-2.26 test: *test_custom
 ruby-2.6-golang-1.14-git-2.27 test: *test_custom
 ruby-2.6-golang-1.14-git-2.27-pgbouncer-1.14 test: *test_custom
+ruby-2.6-golang-1.14-git-2.28 test: *test_custom
+ruby-2.6-golang-1.14-git-2.28-pgbouncer-1.14 test: *test_custom
 
 # Used by GitLab: https://gitlab.com/gitlab-org/gitlab/blob/master/.gitlab-ci.yml
 ruby-2.6.6-golang-1.14-git-2.27-lfs-2.9-chrome-84-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34 test: *test_custom
diff --git a/Dockerfile.custom b/Dockerfile.custom
index d447279..c44c031 100644
--- a/Dockerfile.custom
+++ b/Dockerfile.custom
@@ -15,7 +15,7 @@ ENV PATH $PATH:/usr/local/go/bin
 
 # Git
 ARG GIT_VERSION
-ARG GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git/git-${GIT_VERSION}.tar.gz
+ARG GIT_DOWNLOAD_URL
 ARG GIT_DOWNLOAD_SHA256
 
 RUN if [ -n "$GIT_VERSION" ]; then /scripts/install-pcre2 && pcre2-config --version; fi
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index 958f564..e348ae2 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -97,11 +97,23 @@ function print_git_args() {
             GIT_VERSION=2.27.0
             GIT_DOWNLOAD_SHA256=77ded85cbe42b1ffdc2578b460a1ef5d23bcbc6683eabcafbb0d394dffe2e787
             ;;
+        2.28)
+            GIT_VERSION=2.28.0.rc1
+            GIT_DOWNLOAD_SHA256=f63afef021d710e930f2e4942323b3844fa75d423a7398daf3b1100eb5c8098d
+            ;;
         *) echo "Unknown git version $1"; exit 1;
     esac
 
+    case "$GIT_VERSION" in
+        *.rc[0-9])
+            GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git/testing/git-${GIT_VERSION}.tar.gz;;
+        *)
+            GIT_DOWNLOAD_URL=https://www.kernel.org/pub/software/scm/git/git-${GIT_VERSION}.tar.gz;;
+    esac
+
     printf -- "--build-arg GIT_VERSION=%s " "$GIT_VERSION"
     printf -- "--build-arg GIT_DOWNLOAD_SHA256=%s " "$GIT_DOWNLOAD_SHA256"
+    printf -- "--build-arg GIT_DOWNLOAD_URL=%s " "$GIT_DOWNLOAD_URL"
 }
 
 # see https://github.com/git-lfs/git-lfs/releases