From 33ceb741218f8d499051a97b988787e4be140565 Mon Sep 17 00:00:00 2001 From: Harald Nordgren Date: Sat, 20 Jun 2026 22:46:10 +0000 Subject: [PATCH 1/2] git-gui: drop msgfmt --statistics output The catalog rules ran msgfmt with --statistics, whose output goes to stderr and so survive "make -s". The statistics are not needed, as in 2f12b31b746c (Makefile: don't invoke msgfmt with --statistics, 2021-12-17). Remove it so a quiet build stays quiet. Signed-off-by: Harald Nordgren [j6t: adjust commit message] Signed-off-by: Johannes Sixt --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d33204e875..48d848a59d 100644 --- a/Makefile +++ b/Makefile @@ -155,7 +155,7 @@ $(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) From ed5ccdaca021ececf32da68ef46bcd687e00dafe Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Sun, 21 Jun 2026 11:55:14 +0200 Subject: [PATCH 2/2] git-gui: reduce complexity of the quiet msgfmt rule In non-verbose builds (without V=1) the rule to compile *.po files with msgfmt captures the output in a shell variable and then strips down the text produced by --statistics to fit on a 80 column line. The previous commit removed --statistics output of the msgfmt invocation, so that we don't get to see anything beyond "MSGFMT po/xx.msg" anymore. Make the rule as minimal as the other "quiet" rules. Signed-off-by: Johannes Sixt --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 48d848a59d..2e1711adc5 100644 --- a/Makefile +++ b/Makefile @@ -69,8 +69,7 @@ ifndef V QUIET = @ QUIET_GEN = $(QUIET)echo ' ' GEN '$@' && QUIET_INDEX = $(QUIET)echo ' ' INDEX $(dir $@) && - QUIET_MSGFMT0 = $(QUIET)printf ' MSGFMT %12s ' $@ && v=` - QUIET_MSGFMT1 = 2>&1` && echo "$$v" | sed -e 's/fuzzy translations/fuzzy/' | sed -e 's/ messages*//g' + QUIET_MSGFMT = $(QUIET)echo ' ' MSGFMT '$@' && INSTALL_D0 = dir= INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir" @@ -155,7 +154,7 @@ $(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) --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< $(QUIET_MSGFMT1) + $(QUIET_MSGFMT)$(MSGFMT) --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< lib/tclIndex: $(ALL_LIBFILES) generate-tclindex.sh GIT-GUI-BUILD-OPTIONS $(QUIET_INDEX)$(SHELL_PATH) generate-tclindex.sh . ./GIT-GUI-BUILD-OPTIONS $(ALL_LIBFILES)