Hello,
Recently I had to work on a project which uses legacy 8-bit encoding
(namely cp1250 encoding) instead of utf-8 for text files (LaTeX
documents). My terminal, that is Git Bash from Git for Windows is set
up for utf-8.
I wanted for "git diff" and friends to return something sane on said
utf-8 terminal, instead of mojibake. There is 'encoding'
gitattribute... but it works only for GUI ('git gui', that is).
Therefore I have (ab)used textconv facility to convert from cp1250 of
file encoding to utf-8 encoding of console.
I have set the following in .gitattributes file:
## LaTeX documents in cp1250 encoding
*.tex text diff=mylatex
The 'mylatex' driver is defined as:
[diff "mylatex"]
xfuncname = "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$"
wordRegex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+"
textconv = \"C:/Program Files/Git/usr/bin/iconv.exe\" -f cp1250 -t utf-8
cachetextconv = true
And everything would be all right... if not the fact that Git appends
spurious ^M to added lines in the `git diff` output. Files use CRLF
end-of-line convention (the native MS Windows one).
$ git diff test.tex
diff --git a/test.tex b/test.tex
index 029646e..250ab16 100644
--- a/test.tex
+++ b/test.tex
@@ -1,4 +1,4 @@
-\documentclass{article}
+\documentclass{mwart}^M
\usepackage[cp1250]{inputenc}
\usepackage{polski}
What gives? Why there is this ^M tacked on the end of added lines,
while it is not present in deleted lines, nor in content lines?
Puzzled.
P.S. Git has `i18n.commitEncoding` and `i18n.logOutputEncoding`; pity
that it doesn't supports in core `encoding` attribute together with
having `i18n.outputEncoding`.
--
Jakub Narębski