From: Harald Nordgren via GitGitGadget Date: Sun, 21 Jun 2026 14:56:41 GMT Subject: [PATCH v3 0/2] Silence po catalog output under "make -s" Message-ID: In-Reply-To: The gitk and git-gui are noisy despite "make -s", quiet the builds. Changes in v3: * Split the single combined commit into two, one per Makefile (gitk, git-gui) * gitk: gate the quiet helpers on -s in MAKEFLAGS and give the catalog rule a QUIET_MSGFMT prefix, so a silent build emits no MSGFMT/GEN lines * git-gui: replace the QUIET_MSGFMT0/QUIET_MSGFMT1 pair with a single QUIET_MSGFMT, since with --statistics gone there is no output left to reformat Changes in v2: * Reworked from conditionally silencing msgfmt output under make -s to just removing --statistics outright, following 2f12b31b74 (Makefile: don't invoke msgfmt with --statistics, 2021-12-17) * Also drop gitk's Generating catalog echo, which is not needed either Harald Nordgren (2): gitk: make "make -s" silent git-gui: silence statistics under "make -s" git-gui/Makefile | 5 ++--- gitk-git/Makefile | 6 ++++-- 2 files changed, 6 insertions(+), 5 deletions(-) base-commit: 8d96f09e9245ddf80c1981476fcbac8c4bb4125f Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2339%2FHaraldNordgren%2Fsilence-catalog-output-under-make-s-v3 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2339/HaraldNordgren/silence-catalog-output-under-make-s-v3 Pull-Request: https://github.com/git/git/pull/2339 Range-diff vs v2: 1: ee57c25009 ! 1: 4d977d6f3f gitk, git-gui: drop msgfmt --statistics output @@ Metadata Author: Harald Nordgren ## Commit message ## - gitk, git-gui: drop msgfmt --statistics output + gitk: make "make -s" silent - The catalog rules ran msgfmt with --statistics, whose output went to - stderr and so survived "make -s" (gitk also echoed "Generating - catalog"). + The catalog rule runs msgfmt with --statistics, whose output goes to + stderr and so survives "make -s", and the rule also echoes "Generating + catalog". The Gitk Makefile guards its quiet helpers on V alone, so a + silent build still prints these and the GEN line. The statistics are not needed, as in 2f12b31b746c (Makefile: don't - invoke msgfmt with --statistics, 2021-12-17), and the "Generating - catalog" line is not needed either. Remove them so a quiet build stays - quiet. + invoke msgfmt with --statistics, 2021-12-17). Drop them, suppress the + quiet helpers when "s" is among the make flags, and give the catalog + rule a quiet prefix so a quiet build stays quiet. Signed-off-by: Harald Nordgren - ## git-gui/Makefile ## -@@ git-gui/Makefile: $(PO_TEMPLATE): $(SCRIPT_SH) $(ALL_LIBFILES) - update-po:: $(PO_TEMPLATE) - $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; ) - $(ALL_MSGFILES): %.msg : %.po -- $(QUIET_MSGFMT0)$(MSGFMT) --statistics --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< $(QUIET_MSGFMT1) -+ $(QUIET_MSGFMT0)$(MSGFMT) --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< $(QUIET_MSGFMT1) - - lib/tclIndex: $(ALL_LIBFILES) generate-tclindex.sh GIT-GUI-BUILD-OPTIONS - $(QUIET_INDEX)$(SHELL_PATH) generate-tclindex.sh . ./GIT-GUI-BUILD-OPTIONS $(ALL_LIBFILES) - ## gitk-git/Makefile ## +@@ gitk-git/Makefile: PO_TEMPLATE = po/gitk.pot + ALL_POFILES = $(wildcard po/*.po) + ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES)) + ++ifneq ($(findstring s,$(firstword -$(MAKEFLAGS))),s) + ifndef V + QUIET = @ + QUIET_GEN = $(QUIET)echo ' ' GEN $@ && ++ QUIET_MSGFMT = $(QUIET)echo ' ' MSGFMT $@ && ++endif + endif + + all:: gitk-wish $(ALL_MSGFILES) @@ gitk-git/Makefile: update-po:: $(PO_TEMPLATE) echo; \ echo " git config filter.gettext-no-location.clean \"msgcat --no-location -\"" $(ALL_MSGFILES): %.msg : %.po - @echo Generating catalog $@ - $(MSGFMT) --statistics --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< -+ $(MSGFMT) --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< ++ $(QUIET_MSGFMT)$(MSGFMT) --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< .PHONY: all install uninstall clean update-po .PHONY: FORCE -: ---------- > 2: b613d4ac4a git-gui: silence statistics under "make -s" -- gitgitgadget