diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-10-26 18:06:26 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-10-26 18:06:26 +0300 |
| commit | 70a5b5e99d457ea7cf94dbfff5e9b4837bcc356f (patch) | |
| tree | a1f1ffe85ae33923c24ea088008aba1448a87a6d | |
| parent | 156e65d1de93e779091a0915cf77b2aefa85fadf (diff) | |
| parent | 3cd48d5756b71b0d7eff5c84d21243ff7849f8b3 (diff) | |
Merge branch 'accept-empty-GIT_VERSION' into 'master'
Accept `GIT_VERSION=` environment variable
See merge request gitlab-org/gitaly!4010
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -85,7 +85,7 @@ LIBGIT2_VERSION ?= v1.2.0 # Support both vX.Y.Z and X.Y.Z version patterns, since callers across # GitLab use both. -ifeq ($(origin GIT_VERSION),undefined) +ifeq ($(GIT_VERSION),) GIT_VERSION := v2.33.1 else GIT_VERSION := $(shell echo ${GIT_VERSION} | awk '/^[0-9]\.[0-9]+\.[0-9]+$$/ { printf "v" } { print $$1 }') |