From: Harald Nordgren via GitGitGadget Date: Thu, 04 Jun 2026 06:48:50 GMT Subject: [PATCH v3] git-gui: silence install recipes under "make -s" Message-ID: In-Reply-To: From: Harald Nordgren Several install and uninstall recipes embed "echo" calls that fire as part of the recipe itself, so the install banners (DEST, INSTALL, LINK, REMOVE) were visible whenever the variables expand non-empty. Guard the whole "ifndef V" block on "-s" so the loud variants are selected only when "-s" is absent and V=1 is unset. The existing "-s" check also had its findstring arguments in the wrong order (needle "-s" never fit in haystack "s"), so swap them while moving the check to wrap the block. Signed-off-by: Harald Nordgren --- git-gui: silence install recipes under "make -s" Added sentences to the commit message noting that the old findstring arg order was broken (needle never fit haystack). Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2318%2FHaraldNordgren%2Fgit-gui-respect-silent-flag-v3 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2318/HaraldNordgren/git-gui-respect-silent-flag-v3 Pull-Request: https://github.com/git/git/pull/2318 Range-diff vs v2: 1: 4e4029c8e8 ! 1: 1375fdc1aa git-gui: silence install recipes under "make -s" @@ Commit message LINK, REMOVE) were visible whenever the variables expand non-empty. Guard the whole "ifndef V" block on "-s" so the loud variants are - selected only when "-s" is absent and V=1 is unset. + selected only when "-s" is absent and V=1 is unset. The existing + "-s" check also had its findstring arguments in the wrong order + (needle "-s" never fit in haystack "s"), so swap them while moving + the check to wrap the block. Signed-off-by: Harald Nordgren git-gui/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/git-gui/Makefile b/git-gui/Makefile index ca01068810..d33204e875 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@ -64,6 +64,7 @@ REMOVE_F0 = $(RM_RF) # space is required here REMOVE_F1 = CLEAN_DST = true +ifneq ($(findstring s,$(firstword -$(MAKEFLAGS))),s) ifndef V QUIET = @ QUIET_GEN = $(QUIET)echo ' ' GEN '$@' && @@ -89,6 +90,7 @@ ifndef V REMOVE_F0 = dst= REMOVE_F1 = && echo ' ' REMOVE `basename "$$dst"` && $(RM_RF) "$$dst" endif +endif TCLTK_PATH ?= wish ifeq (./,$(dir $(TCLTK_PATH))) @@ -97,10 +99,6 @@ else TCL_PATH ?= $(dir $(TCLTK_PATH))$(notdir $(subst wish,tclsh,$(TCLTK_PATH))) endif -ifeq ($(findstring $(firstword -$(MAKEFLAGS)),s),s) -QUIET_GEN = -endif - -include config.mak DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) base-commit: 9ac3f193c05c2237e2b14ebaa1149e9fc8a1abe0 -- gitgitgadget