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-02-07 12:34:02 +0300
commit44af1b4e59bac969590878d3deb79ad1dacc2b97 (patch)
tree9bdb2a3a47538b514a5faf7eb553f8f69e7b3d67
parent57df98755d3ba67ec68fa3ef3038afa302bc066c (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 f20184e4b..83d5ebe7e 100644
--- a/Makefile
+++ b/Makefile
@@ -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.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.