diff options
| author | John Cai <jcai@gitlab.com> | 2022-08-05 18:08:45 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2022-08-05 18:08:45 +0300 |
| commit | 7b009056155ea075a756cc1f192da5f7ae58bc25 (patch) | |
| tree | 8a081e9b65b16ecd584ecaf2561e5295f25e0949 | |
| parent | e8b11a7d230d98a686d5f13f88cd885135d41787 (diff) | |
| parent | 4e8e6fc81206f73218b976d44156b9bd00f60a1a (diff) | |
Merge branch 'pks-git-default-v2.37.1.gl1' into 'master'
git: Upgrade default Git distribution to v2.37.1.gl1
Closes #4193
See merge request gitlab-org/gitaly!4787
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -153,7 +153,7 @@ 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.35.1 + override GIT_VERSION := v2.37.1 # This extra version has two intentions: first, it allows us to detect # capabilities of the command at runtime. Second, it helps admins to @@ -166,7 +166,7 @@ ifeq (${GIT_VERSION:default=},) # Before adding custom patches, please read doc/PROCESS.md#Patching-git # first to make sure your patches meet our acceptance criteria. Patches # must be put into `_support/git-patches`. - GIT_PATCHES := $(sort $(wildcard ${SOURCE_DIR}/_support/git-patches/v2.35.1.gl1/*)) + GIT_PATCHES := $(sort $(wildcard ${SOURCE_DIR}/_support/git-patches/v2.37.1.gl1/*)) else # Support both vX.Y.Z and X.Y.Z version patterns, since callers across GitLab # use both. |