mirror of
https://github.com/git/git.git
synced 2024-11-19 15:04:03 +01:00
1ffca60f0b
Most folks using git-gui on internationalized files have complained that it doesn't recognize UTF-8 correctly. In the past we have just ignored the problem and showed the file contents as binary/US-ASCII, which is wrong no matter how you look at it. This really should be a per-file attribute, managed by .gitattributes, so we now pull the "encoding" attribute data for the given path from the .gitattributes (if available) and use that, falling back to UTF-8 if the attributes are unavailable, git-check-attr is broken, or an encoding for this path not specified. We apply the encoding anytime we show file content, which currently is limited to only the diff viewer and the blame viewer. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
4 lines
84 B
Plaintext
4 lines
84 B
Plaintext
* encoding=US-ASCII
|
|
git-gui.sh encoding=UTF-8
|
|
/po/*.po encoding=UTF-8
|