Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2023-04-19 16:50:51 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2023-04-21 07:37:02 +0300
commite80bf49739dbf9c8443050806338fff891f483f8 (patch)
tree543e028e30497a6dc3e73870d865b999adfa242a /Makefile
parent982504bd5964fc186f06f65089fa1f50a552cb0a (diff)
git: Include backported geometric-repacking patches
Geometric repacking is currently broken when executed in a repository that is connected to an alternate object database. We have upstreamed fixes via de56e80363 (Merge branch 'ps/fix-geom-repack-with-alternates' into next, 2023-04-18), and in order to roll out geometric repacking globally those fixes have been backported into our Git v2.40.0.gl1. Upgrade our Git version so that the backported fixes are included. Changelog: fixed
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 29b3ec353..68339930c 100644
--- a/Makefile
+++ b/Makefile
@@ -135,7 +135,7 @@ GIT_VERSION ?=
## The Git version used for bundled Git v2.39.
GIT_VERSION_2_39 ?= v2.39.2
## The Git version used for bundled Git v2.40.
-GIT_VERSION_2_40 ?= v2.40.0
+GIT_VERSION_2_40 ?= v2.40.0.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