diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-05-23 14:04:28 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-05-23 14:04:28 +0300 |
| commit | b66c2791c6f6fbb967433e13d9b7b954b2bc68a7 (patch) | |
| tree | 6c7659d4c64d160daef0b9ab66adc816af3a38ca | |
| parent | 133c22f56e7120806abd3ae5dadda59a9b475055 (diff) | |
| parent | 2e850d25ac852df2e2e175e09f7ddf7a4caba8ba (diff) | |
Merge branch 'fix-git-version' into 'master'
makefile: Override to git 2.40 if version is unset
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5829
Merged-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Approved-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Co-authored-by: Karthik Nayak <knayak@gitlab.com>
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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. |