diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-02-25 14:43:00 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-02-25 15:04:49 +0300 |
| commit | bcd7a5ee38f86ab0c31c9d515d367227eee785cc (patch) | |
| tree | 80770324f7ed86cb21af2aed05d3ae7c3933c39d | |
| parent | b1e6c1055df86d486c92d28b09aa7d8e63842147 (diff) | |
Makefile: set --initial-branch=master on "git init"
Quiet the verbose warning about setting init.defaultBranch in recent
versions of git (due to the master->main transition).
This doesn't matter at all for this use-case of "init", so let's just
explicitly set it to the current default to appease it under V=1, now
that we're not running git with --quiet anymore in that mode.
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -410,7 +410,7 @@ ${DEPENDENCY_DIR}/git.version: dependency-version | ${DEPENDENCY_DIR} ${Q}[ x"$$(cat "$@" 2>/dev/null)" = x"${GIT_VERSION}" ] || >$@ echo -n "${GIT_VERSION}" ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a: ${DEPENDENCY_DIR}/libgit2.version - ${Q}[ -d "${LIBGIT2_SOURCE_DIR}" ] || ${GIT} init ${GIT_QUIET} ${LIBGIT2_SOURCE_DIR} + ${Q}[ -d "${LIBGIT2_SOURCE_DIR}" ] || ${GIT} init --initial-branch=master ${GIT_QUIET} ${LIBGIT2_SOURCE_DIR} ${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" fetch --depth 1 ${GIT_QUIET} ${LIBGIT2_REPO_URL} ${LIBGIT2_VERSION} ${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" switch ${GIT_QUIET} --detach FETCH_HEAD ${Q}rm -rf ${LIBGIT2_BUILD_DIR} @@ -421,7 +421,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}[ -d "${GIT_SOURCE_DIR}" ] || ${GIT} init ${GIT_QUIET} ${GIT_SOURCE_DIR} + ${Q}[ -d "${GIT_SOURCE_DIR}" ] || ${GIT} init --initial-branch=master ${GIT_QUIET} ${GIT_SOURCE_DIR} ${Q}${GIT} -C "${GIT_SOURCE_DIR}" fetch --depth 1 ${GIT_QUIET} ${GIT_REPO_URL} ${GIT_VERSION} ${Q}${GIT} -C "${GIT_SOURCE_DIR}" switch ${GIT_QUIET} --detach FETCH_HEAD ${Q}rm -rf ${GIT_INSTALL_DIR} |