Makefile: Upgrade bundled Git to v2.36.1

We have recently introduced a new bundled Git v2.36.0.gl1. Closely
before we wanted to start the rollout of that version to production
though a new patch release v2.36.1 was released by the Git project.

Upgrade Git to this new version. Note that we directly replace our
bundled Git v2.36.0.gl1. This is fine though given that it has not yet
been rolled out.

Changelog: changed

6 files changed, 17 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 2c5844cfa..fc6ee3b91 100644
--- a/Makefile
+++ b/Makefile
@@ -303,17 +303,17 @@ install: build
 .PHONY: build-bundled-git
 ## Build bundled Git binaries.
 build-bundled-git: build-bundled-git-v2.35.1.gl1
-build-bundled-git: build-bundled-git-v2.36.0.gl1
+build-bundled-git: build-bundled-git-v2.36.1.gl1
 build-bundled-git-v2.35.1.gl1: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.35.1.gl1,${GIT_EXECUTABLES})
-build-bundled-git-v2.36.0.gl1: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.36.0.gl1,${GIT_EXECUTABLES})
+build-bundled-git-v2.36.1.gl1: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.36.1.gl1,${GIT_EXECUTABLES})
 
 .PHONY: install-bundled-git
 ## Install bundled Git binaries. The target directory can be modified by
 ## setting PREFIX and DESTDIR.
 install-bundled-git: install-bundled-git-v2.35.1.gl1
-install-bundled-git: install-bundled-git-v2.36.0.gl1
+install-bundled-git: install-bundled-git-v2.36.1.gl1
 install-bundled-git-v2.35.1.gl1: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.35.1.gl1,${GIT_EXECUTABLES})
-install-bundled-git-v2.36.0.gl1: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.36.0.gl1,${GIT_EXECUTABLES})
+install-bundled-git-v2.36.1.gl1: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.36.1.gl1,${GIT_EXECUTABLES})
 
 ifdef WITH_BUNDLED_GIT
 build: build-bundled-git
@@ -581,10 +581,10 @@ ${BUILD_DIR}/bin/gitaly-%-v2.35.1.gl1: override GIT_EXTRA_VERSION = gl1
 ${BUILD_DIR}/bin/gitaly-%-v2.35.1.gl1: ${DEPENDENCY_DIR}/git-v2.35.1.gl1/% | ${BUILD_DIR}/bin
 	${Q}install $< $@
 
-${BUILD_DIR}/bin/gitaly-%-v2.36.0.gl1: override GIT_PATCHES := $(sort $(wildcard ${SOURCE_DIR}/_support/git-patches/v2.36.0.gl1/*))
-${BUILD_DIR}/bin/gitaly-%-v2.36.0.gl1: override GIT_VERSION = v2.36.0
-${BUILD_DIR}/bin/gitaly-%-v2.36.0.gl1: override GIT_EXTRA_VERSION = gl1
-${BUILD_DIR}/bin/gitaly-%-v2.36.0.gl1: ${DEPENDENCY_DIR}/git-v2.36.0.gl1/% | ${BUILD_DIR}/bin
+${BUILD_DIR}/bin/gitaly-%-v2.36.1.gl1: override GIT_PATCHES := $(sort $(wildcard ${SOURCE_DIR}/_support/git-patches/v2.36.1.gl1/*))
+${BUILD_DIR}/bin/gitaly-%-v2.36.1.gl1: override GIT_VERSION = v2.36.1
+${BUILD_DIR}/bin/gitaly-%-v2.36.1.gl1: override GIT_EXTRA_VERSION = gl1
+${BUILD_DIR}/bin/gitaly-%-v2.36.1.gl1: ${DEPENDENCY_DIR}/git-v2.36.1.gl1/% | ${BUILD_DIR}/bin
 	${Q}install $< $@
 
 ${INSTALL_DEST_DIR}/gitaly-%: ${BUILD_DIR}/bin/gitaly-%
diff --git a/internal/git/command_factory_test.go b/internal/git/command_factory_test.go
index 765837ad3..b1ffe5823 100644
--- a/internal/git/command_factory_test.go
+++ b/internal/git/command_factory_test.go
@@ -181,8 +181,8 @@ func TestCommandFactory_ExecutionEnvironment(t *testing.T) {
 	})
 
 	t.Run("set using GITALY_TESTING_BUNDLED_GIT_PATH", func(t *testing.T) {
-		ctx := featureflag.ContextWithFeatureFlag(ctx, featureflag.GitV2360Gl1, true)
-		suffix := "-v2.36.0.gl1"
+		ctx := featureflag.ContextWithFeatureFlag(ctx, featureflag.GitV2361Gl1, true)
+		suffix := "-v2.36.1.gl1"
 
 		bundledGitDir := testhelper.TempDir(t)
 
diff --git a/internal/git/execution_environment.go b/internal/git/execution_environment.go
index 7122f3d3c..3ee1f3ea8 100644
--- a/internal/git/execution_environment.go
+++ b/internal/git/execution_environment.go
@@ -26,9 +26,9 @@ var (
 	// case `IsEnabled()` returns `false` though.
 	ExecutionEnvironmentConstructors = []ExecutionEnvironmentConstructor{
 		BundledGitEnvironmentConstructor{
-			Suffix: "-v2.36.0.gl1",
+			Suffix: "-v2.36.1.gl1",
 			FeatureFlags: []featureflag.FeatureFlag{
-				featureflag.GitV2360Gl1,
+				featureflag.GitV2361Gl1,
 			},
 		},
 		BundledGitEnvironmentConstructor{
diff --git a/internal/metadata/featureflag/ff_git_v2360.go b/internal/metadata/featureflag/ff_git_v2360.go
deleted file mode 100644
index bc2a3971b..000000000
--- a/internal/metadata/featureflag/ff_git_v2360.go
+++ /dev/null
@@ -1,4 +0,0 @@
-package featureflag
-
-// GitV2360Gl1 will enable use of Git v2.36.0.gl1.
-var GitV2360Gl1 = NewFeatureFlag("git_v2360gl1", false)
diff --git a/internal/metadata/featureflag/ff_git_v2361.go b/internal/metadata/featureflag/ff_git_v2361.go
new file mode 100644
index 000000000..693206477
--- /dev/null
+++ b/internal/metadata/featureflag/ff_git_v2361.go
@@ -0,0 +1,4 @@
+package featureflag
+
+// GitV2361Gl1 will enable use of Git v2.36.1.gl1.
+var GitV2361Gl1 = NewFeatureFlag("git_v2361gl1", false)
diff --git a/internal/testhelper/testhelper.go b/internal/testhelper/testhelper.go
index 05cdfe66e..281dbc5b8 100644
--- a/internal/testhelper/testhelper.go
+++ b/internal/testhelper/testhelper.go
@@ -179,7 +179,7 @@ func ContextWithoutCancel(opts ...ContextOpt) context.Context {
 	ctx = featureflag.ContextWithFeatureFlag(ctx, featureflag.ConcurrencyQueueMaxWait, true)
 	// Randomly inject the Git flag so that we have coverage of tests with both old and new Git
 	// version by pure chance.
-	ctx = featureflag.ContextWithFeatureFlag(ctx, featureflag.GitV2360Gl1, rnd.Int()%2 == 0)
+	ctx = featureflag.ContextWithFeatureFlag(ctx, featureflag.GitV2361Gl1, rnd.Int()%2 == 0)
 
 	for _, opt := range opts {
 		ctx = opt(ctx)