]> git.ipfire.org Git - thirdparty/git.git/commitdiff
git-gui: mark *.po files at any directory level as UTF-8
authorJohannes Sixt <j6t@kdbg.org>
Sun, 25 Jan 2026 09:46:23 +0000 (10:46 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Sun, 25 Jan 2026 09:53:08 +0000 (10:53 +0100)
When a commit is viewed in Gitk that changes a file in po/glossary, the
patch text shows mojibake instead of correctly decoded UTF-8 text.
Gitk retrieves the encoding attribute to decide how to treat the bytes
that make up the patch text. There is an attribute definition that all
files are US-ASCII, and a later attribute definition overrides this.
But the override, which specifies UTF-8, applies only to *.po files in
directory po/ and does not apply to subdirectories.

Widen the pattern to apply to all directory levels.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
.gitattributes

index 889d58257fb3c8ba1835f088daa94aaec1a3d80f..f03c0fe3c9fe49782030576b8b9ca185fcaeabf6 100644 (file)
@@ -1,7 +1,7 @@
 *           whitespace=indent-with-non-tab,trailing-space,space-before-tab,tabwidth=4
 *           encoding=US-ASCII
 git-gui.sh  encoding=UTF-8
-/po/*.po    encoding=UTF-8
+*.po        encoding=UTF-8
 /GIT-VERSION-GEN eol=lf
 Makefile    whitespace=!indent,trail,space
 meson.build whitespace=space