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-01-18 11:00:22 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2023-01-18 11:00:22 +0300
commit79c0052f84e88e0e4796831ce7d64a436784b859 (patch)
treee7b30022d2a50a0f4f7c336f9780d2abf3307d5b
parent76111e53cf96fddefb742ff31ae1509ec2745870 (diff)
Makefile: Deduplicate the version of the Git distribution
Typically, we have up to three different Git versions in Gitaly: - Two bundled Git versions that can be toggled with a feature flag. - The distributed Git version. The distributed Git version will always be matching one of the bundled Git versions, namely the one that is the current default. So let's deduplicate these versions and just reuse the bundled Git's version so that we don't need to remember updating the version in multiple places on minor version bumps.
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a73ea74a6..cf7f1a6b7 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,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.38.3.gl1
+ override GIT_VERSION := ${GIT_VERSION_2_38}
else
# Support both vX.Y.Z and X.Y.Z version patterns, since callers across GitLab
# use both.