Git development
 help / color / mirror / Atom feed
From: Johannes Sixt <j6t@kdbg.org>
To: Harald Nordgren <haraldnordgren@gmail.com>
Cc: git@vger.kernel.org,
	Harald Nordgren via GitGitGadget <gitgitgadget@gmail.com>
Subject: [PATCH 2/1] git-gui: reduce complexity of the quiet msgfmt rule
Date: Sun, 21 Jun 2026 12:33:35 +0200	[thread overview]
Message-ID: <efc97fee-a98c-497f-94a9-6f8b77667f30@kdbg.org> (raw)
In-Reply-To: <pull.2339.v2.git.git.1781995570677.gitgitgadget@gmail.com>

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 <j6t@kdbg.org>
---
Am 21.06.26 um 00:46 schrieb Harald Nordgren via GitGitGadget:
> The catalog rules ran msgfmt with --statistics, whose output went to
> stderr and so survived "make -s" (gitk also echoed "Generating
> catalog").
> 
> 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.

I split off the git-gui part, adjusted the commit message, and then
applied the patch below to simplify the Makefile further.

 Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 48d848a59dfb..2e1711adc5a5 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)
-- 
2.55.0.rc0.230.g889306758c



  reply	other threads:[~2026-06-21 10:33 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-14 17:52 [PATCH 0/2] Silence po catalog output under "make -s" Harald Nordgren via GitGitGadget
2026-06-14 17:52 ` [PATCH 1/2] gitk: silence " Harald Nordgren via GitGitGadget
2026-06-14 17:52 ` [PATCH 2/2] git-gui: silence statistics " Harald Nordgren via GitGitGadget
2026-06-15 19:25 ` [PATCH 0/2] Silence po catalog output " Harald Nordgren
2026-06-20 15:46 ` Johannes Sixt
2026-06-20 22:46 ` [PATCH v2] gitk, git-gui: drop msgfmt --statistics output Harald Nordgren via GitGitGadget
2026-06-21 10:33   ` Johannes Sixt [this message]
2026-06-21 13:00   ` Johannes Sixt
2026-06-21 13:15     ` Harald Nordgren
2026-06-21 13:27       ` Johannes Sixt
2026-06-21 13:32         ` Harald Nordgren
2026-06-21 13:47           ` Johannes Sixt
2026-06-21 14:56   ` [PATCH v3 0/2] Silence po catalog output under "make -s" Harald Nordgren via GitGitGadget
2026-06-21 14:56     ` [PATCH v3 1/2] gitk: make "make -s" silent Harald Nordgren via GitGitGadget
2026-06-21 14:56     ` [PATCH v3 2/2] git-gui: silence statistics under "make -s" Harald Nordgren via GitGitGadget

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=efc97fee-a98c-497f-94a9-6f8b77667f30@kdbg.org \
    --to=j6t@kdbg.org \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=haraldnordgren@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox