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:
authorKarthik Nayak <knayak@gitlab.com>2023-05-23 12:33:15 +0300
committerKarthik Nayak <knayak@gitlab.com>2023-05-23 12:33:15 +0300
commit2e850d25ac852df2e2e175e09f7ddf7a4caba8ba (patch)
treed585c4a826985bb87cec77cf2bae0d36458cbb82 /Makefile
parent908123117739f917d69dd32c10b5eb0865fe86b0 (diff)
makefile: Override to git 2.40 if version is unset
In the commit 'Makefile: Stop building git 2.39' (3fb282e70d977a8224636818996cdb6ced7292e1) we removed the previous git version v2.39 from being built. But we missed overriding the `GIT_VERSION` variable to the newer git version v2.40. This causes the dependency to be incorrectly built.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9d79d0474..821e08728 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 := ${GIT_VERSION_2_39}
+ override GIT_VERSION := ${GIT_VERSION_2_40}
else
# Support both vX.Y.Z and X.Y.Z version patterns, since callers across GitLab
# use both.