[pull] master from git:master#233
Merged
Merged
Conversation
Signed-off-by: basuradeluis <basuradeluis@gmail.com>
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
* 'master' of github.com:alshopov/git-gui: git-gui i18n: Update Bulgarian translation (562t) Signed-off-by: Johannes Sixt <j6t@kdbg.org>
* 'master' of github.com:alshopov/gitk: gitk i18n: Update Bulgarian translation (329t) Signed-off-by: Johannes Sixt <j6t@kdbg.org>
The catalog rules ran msgfmt with --statistics, whose output goes to stderr and so survive "make -s". The statistics are not needed, as in 2f12b31 (Makefile: don't invoke msgfmt with --statistics, 2021-12-17). Remove it so a quiet build stays quiet. Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com> [j6t: adjust commit message] Signed-off-by: Johannes Sixt <j6t@kdbg.org>
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>
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 2f12b31 (Makefile: don't 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 <haraldnordgren@gmail.com> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Users may like to make the main window very wide. In this case, a rather small size of the commit message field leaves a wide unused space at the bottom-right. Allow settting the field width to values much larger than 99 characters. In fact, users can set it to extreme values to fill the entire space regardless of window width: the widget geometry will be negotiated to be limited to the available space despite the large requested width. Signed-off-by: Alexander Shopov <ash@kambanaria.org>
* 'spanish_pr_bis' of github.com:basuradeluis/gitkbis: gitk: spanish translations Signed-off-by: Johannes Sixt <j6t@kdbg.org>
* hn/silence-make-s: git-gui: reduce complexity of the quiet msgfmt rule git-gui: drop msgfmt --statistics output
* 'master' of github.com:alshopov/git-gui: git-gui: allow larger width for the commit message field Signed-off-by: Johannes Sixt <j6t@kdbg.org>
* 'master' of https://github.com/j6t/gitk: gitk: make "make -s" silent gitk i18n: Update Bulgarian translation (329t) gitk: spanish translations
* 'master' of https://github.com/j6t/git-gui: git-gui: allow larger width for the commit message field git-gui: reduce complexity of the quiet msgfmt rule git-gui: drop msgfmt --statistics output git-gui i18n: Update Bulgarian translation (562t)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )