diff options
| author | Pavlo Strokov <pstrokov@gitlab.com> | 2021-03-24 13:00:14 +0300 |
|---|---|---|
| committer | Pavlo Strokov <pstrokov@gitlab.com> | 2021-03-24 13:00:14 +0300 |
| commit | d8a400f6b0f32460d419809efe3e8313bc861a44 (patch) | |
| tree | c4b3b355695162ff863ced5ac292852385fd4d83 | |
| parent | e5a5248aa4aa712b773e95a4dcf4f19edaf9d283 (diff) | |
| parent | 3d50d608fef4a2f30e8962088f0aeca74aa56988 (diff) | |
Merge branch 'pks-makefile-git-init-default-branch' into 'master'
Makefile: Fix libgit2/git builds with old git versions
See merge request gitlab-org/gitaly!3288
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -422,7 +422,7 @@ ${TOOLS_DIR}/%.version: dependency-version | ${TOOLS_DIR} ${Q}[ x"$$(cat "$@" 2>/dev/null)" = x"${TOOL_VERSION}" ] || >$@ echo -n "${TOOL_VERSION}" ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a: ${DEPENDENCY_DIR}/libgit2.version - ${Q}${GIT} init --initial-branch=master ${GIT_QUIET} ${LIBGIT2_SOURCE_DIR} + ${Q}${GIT} -c init.defaultBranch=master init ${GIT_QUIET} ${LIBGIT2_SOURCE_DIR} ${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" config remote.origin.url ${LIBGIT2_REPO_URL} ${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" config remote.origin.tagOpt --no-tags ${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" fetch --depth 1 ${GIT_QUIET} origin ${LIBGIT2_VERSION} @@ -435,7 +435,7 @@ ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a: ${DEPENDENCY_DIR}/libgit2.version ifeq (${GIT_USE_PREBUILT_BINARIES},) ${GIT_INSTALL_DIR}/bin/git: ${DEPENDENCY_DIR}/git.version - ${Q}${GIT} init --initial-branch=master ${GIT_QUIET} ${GIT_SOURCE_DIR} + ${Q}${GIT} -c init.defaultBranch=master init ${GIT_QUIET} ${GIT_SOURCE_DIR} ${Q}${GIT} -C "${GIT_SOURCE_DIR}" config remote.origin.url ${GIT_REPO_URL} ${Q}${GIT} -C "${GIT_SOURCE_DIR}" config remote.origin.tagOpt --no-tags ${Q}${GIT} -C "${GIT_SOURCE_DIR}" fetch --depth 1 ${GIT_QUIET} origin ${GIT_VERSION} |