Merge remote-tracking branch 'dev/15-6-stable' into 15-6-stable15-6-stable

3 files changed, 10 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0afbe04d0..fc501a566 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Gitaly changelog
 
+## 15.6.8 (2023-02-10)
+
+### Security (1 change)
+
+- [git: Upgrade to Git security release v2.38.4.gl1 and v2.37.6.gl1](gitlab-org/security/gitaly@4b7013dee1e9ee5ce7accb50c674fae1ddd2b4cb) ([merge request](gitlab-org/security/gitaly!80))
+
 ## 15.6.7 (2023-01-30)
 
 No changes.
diff --git a/Makefile b/Makefile
index 8a6bde766..a4cde371b 100644
--- a/Makefile
+++ b/Makefile
@@ -134,9 +134,9 @@ GIT_EXECUTABLES += git-http-backend
 ## tags, branches, and commit ids.
 GIT_VERSION ?=
 ## The Git version used for bundled Git v2.37.
-GIT_VERSION_2_37_1 ?= v2.37.5.gl1
+GIT_VERSION_2_37_1 ?= v2.37.6.gl1
 ## The Git version used for bundled Git v2.38.
-GIT_VERSION_2_38 ?= v2.38.3.gl1
+GIT_VERSION_2_38 ?= v2.38.4.gl1
 
 ## Skip overriding the Git version and instead use the Git version as specified
 ## in the Git sources. This is required when building Git from a version that
@@ -146,7 +146,7 @@ SKIP_OVERRIDING_GIT_VERSION ?=
 # The default version is used in case the caller does not set the variable or
 # if it is either set to the empty string or "default".
 ifeq (${GIT_VERSION:default=},)
-    override GIT_VERSION := v2.37.5.gl1
+    override GIT_VERSION := ${GIT_VERSION_2_37_1}
 else
     # Support both vX.Y.Z and X.Y.Z version patterns, since callers across GitLab
     # use both.
diff --git a/VERSION b/VERSION
index b5759ae49..8ced5beae 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.6.7
\ No newline at end of file
+15.6.8
\ No newline at end of file