git: Bump minimum required Git version to v2.36.0git-update-v2.36.0

We want to utilize the newly added `--batch-command` flag in
git-cat-file(1). This is introduced in v2.36.0. So as a precursor to the
actual code change, let's bump the git version first.

Changelog: deprecated

3 files changed, 15 insertions, 14 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30485d951..806583fb6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -150,7 +150,7 @@ build:
     matrix:
       - GO_VERSION: [ "1.17", "1.18" ]
         TEST_BOOT_ARGS: "--bundled-git"
-      - GIT_VERSION: "v2.33.0"
+      - GIT_VERSION: "v2.36.0"
 
 build:binaries:
   needs: []
@@ -187,7 +187,7 @@ test:
       # We also verify that things work as expected with a non-bundled Git
       # version matching our minimum required Git version.
       - TEST_TARGET: test
-        GIT_VERSION: "v2.33.0"
+        GIT_VERSION: "v2.36.0"
       # Execute tests with our minimum required Postgres version, as well. If
       # the minimum version changes, please change this to the new minimum
       # version. Furthermore, please make sure to update the minimum required
diff --git a/internal/git/version.go b/internal/git/version.go
index 881f4adc0..16978c0ac 100644
--- a/internal/git/version.go
+++ b/internal/git/version.go
@@ -16,9 +16,9 @@ import (
 // - https://gitlab.com/gitlab-org/gitlab-foss/blob/master/.gitlab-ci.yml
 // - https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/system_check/app/git_version_check.rb
 var minimumVersion = Version{
-	versionString: "2.33.0",
+	versionString: "2.36.0",
 	major:         2,
-	minor:         33,
+	minor:         36,
 	patch:         0,
 	rc:            false,
 
diff --git a/internal/git/version_test.go b/internal/git/version_test.go
index 49bc56af7..60d0fd327 100644
--- a/internal/git/version_test.go
+++ b/internal/git/version_test.go
@@ -109,11 +109,12 @@ func TestVersion_IsSupported(t *testing.T) {
 		{"2.24.0", false},
 		{"2.25.0", false},
 		{"2.32.0", false},
-		{"2.33.0-rc0", false},
-		{"2.33.0", true},
-		{"2.33.0.gl0", true},
-		{"2.33.0.gl1", true},
-		{"2.33.1", true},
+		{"2.33.0", false},
+		{"2.36.0-rc0", false},
+		{"2.36.0", true},
+		{"2.36.0.gl0", true},
+		{"2.36.0.gl1", true},
+		{"2.36.1", true},
 		{"3.0.0", true},
 		{"3.0.0.gl5", true},
 	} {
@@ -134,11 +135,11 @@ func TestVersion_FlushesUpdaterefStatus(t *testing.T) {
 		{"2.31.0-rc0", false},
 		{"2.31.1", false},
 		{"2.33.0", false},
-		{"2.33.0.gl0", false},
-		{"2.33.0.gl2", false},
-		{"2.33.0.gl3", true},
-		{"2.33.0.gl4", true},
-		{"2.33.1", true},
+		{"2.36.0-rc0", true},
+		{"2.36.0", true},
+		{"2.36.0.gl0", true},
+		{"2.36.0.gl1", true},
+		{"2.36.1", true},
 		{"3.0.0", true},
 		{"3.0.0.gl5", true},
 	} {