diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-02-25 02:49:29 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-02-25 14:42:27 +0300 |
| commit | b1e6c1055df86d486c92d28b09aa7d8e63842147 (patch) | |
| tree | 753feef1e975415e5a1d5486114d9324715c8fdf | |
| parent | 91c8bc98fbf4255dc88b3f013b0c52a0dfd071ca (diff) | |
Makefile: replace "git [...] --quiet" with "git [...]" under V=1
When running under V=1 we should not invoke git with --quiet, it's
helpful to see its debug and progress output. Change both recently
added --quiet flags, as well as long-standing ones to a variable we
set based on whether ${Q} is "@" or not.
| -rw-r--r-- | Makefile | 20 |
1 files changed, 12 insertions, 8 deletions
@@ -81,6 +81,10 @@ GIT_BINARIES_URL ?= https://gitlab.com/gitlab-org/gitlab-git/-/jobs/artifacts/$ GIT_BINARIES_HASH ?= 8c88d2adb46d1d07f258904b227c93b8a5a4942ac32a1e54057f215401332141 GIT_INSTALL_DIR := ${DEPENDENCY_DIR}/git/install GIT_SOURCE_DIR := ${DEPENDENCY_DIR}/git/source +GIT_QUIET := +ifeq (${Q},@) + GIT_QUIET = --quiet +endif ifeq (${GIT_BUILD_OPTIONS},) # activate developer checks @@ -406,9 +410,9 @@ ${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 --quiet ${LIBGIT2_SOURCE_DIR} - ${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" fetch --depth 1 --quiet ${LIBGIT2_REPO_URL} ${LIBGIT2_VERSION} - ${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" switch --quiet --detach FETCH_HEAD + ${Q}[ -d "${LIBGIT2_SOURCE_DIR}" ] || ${GIT} init ${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} ${Q}mkdir -p ${LIBGIT2_BUILD_DIR} ${Q}cd ${LIBGIT2_BUILD_DIR} && cmake ${LIBGIT2_SOURCE_DIR} ${LIBGIT2_BUILD_OPTIONS} @@ -417,9 +421,9 @@ ${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 --quiet ${GIT_SOURCE_DIR} - ${Q}${GIT} -C "${GIT_SOURCE_DIR}" fetch --depth 1 --quiet ${GIT_REPO_URL} ${GIT_VERSION} - ${Q}${GIT} -C "${GIT_SOURCE_DIR}" switch --quiet --detach FETCH_HEAD + ${Q}[ -d "${GIT_SOURCE_DIR}" ] || ${GIT} init ${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} ${Q}mkdir -p ${GIT_INSTALL_DIR} env -u MAKEFLAGS -u GIT_VERSION ${MAKE} -C ${GIT_SOURCE_DIR} -j$(shell nproc) prefix=${GIT_PREFIX} ${GIT_BUILD_OPTIONS} install @@ -472,7 +476,7 @@ ${GO_LICENSES}: TOOL_PACKAGE = github.com/google/go-licenses@73411c8fa237c ${PROTOC_GEN_GO}: TOOL_PACKAGE = github.com/golang/protobuf/protoc-gen-go@v${PROTOC_GEN_GO_VERSION} ${TEST_REPO}: - ${GIT} clone --bare --quiet https://gitlab.com/gitlab-org/gitlab-test.git $@ + ${GIT} clone --bare ${GIT_QUIET} https://gitlab.com/gitlab-org/gitlab-test.git $@ # Git notes aren't fetched by default with git clone ${GIT} -C $@ fetch origin refs/notes/*:refs/notes/* rm -rf $@/refs @@ -481,7 +485,7 @@ ${TEST_REPO}: ${GIT} -C $@ fsck --no-progress ${TEST_REPO_GIT}: - ${GIT} clone --bare --quiet https://gitlab.com/gitlab-org/gitlab-git-test.git $@ + ${GIT} clone --bare ${GIT_QUIET} https://gitlab.com/gitlab-org/gitlab-git-test.git $@ rm -rf $@/refs mkdir -p $@/refs/heads $@/refs/tags cp ${SOURCE_DIR}/_support/gitlab-git-test.git-packed-refs $@/packed-refs |