Character encoding with msysgit
Just a wild guess but I had a similar problem with letters in someone's name in a Rakefile recently and I actually had to change the encoding of my CMD environment to run it.
Look at step number two on this wiki:
https://github.com/NancyFx/Nancy/wiki/Having-trouble-with-rake%3F
The Microsoft documentation on the chcp command is here:http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/chcp.mspx?mfr=true
Using i18n.commitEncoding is better supported with modern Git (2019), but only Git 2.25 (Q1 2020), provides a full support: Handling of commit objects that use non UTF-8 encoding during "rebase -i
" has been improved.
See commit 52f52e5, commit 5772b0c (11 Nov 2019), commit b375744, commit 019a9d8, commit 0798d16, commit e4b95b3, commit 1ba6e7a (08 Nov 2019), and commit 99b2ba3 (07 Nov 2019) by Doan Tran Cong Danh (congdanhqx-zz
).
(Merged by Junio C Hamano -- gitster
-- in commit 6511cb3, 01 Dec 2019)
sequencer
: reencode old merge-commit messageSigned-off-by: Doan Tran Cong Danh
During rebasing, old merge's message (encoded in old encoding) will be used as message for new merge commit (created by rebase).
In case of the value of
i18n.commitencoding
has been changed after the old merge time. We will receive an unusable message for this new merge.Correct it.
sequencer
: reencode to utf-8 before arrange rebase's todo listSigned-off-by: Doan Tran Cong Danh
On
musl libc
, ISO-2022-JP encoder is too eager to switch back to 1 byte encoding,musl
'siconv
always switch back after every combining character.
Comparingglibc
andmusl
's output for this command$ sed q t/t3900/ISO-2022-JP.txt| iconv -f ISO-2022-JP -t utf-8 `|` iconv -f utf-8 -t ISO-2022-JP | xxdglibc: 00000000: 1b24 4224 4f24 6c24 5224 5b24 551b 2842 .$B$O$l$R$[$U.(B00000010: 0a .musl: 00000000: 1b24 4224 4f1b 2842 1b24 4224 6c1b 2842 .$B$O.(B.$B$l.(B00000010: 1b24 4224 521b 2842 1b24 4224 5b1b 2842 .$B$R.(B.$B$[.(B00000020: 1b24 4224 551b 2842 0a .$B$U.(B.
Although
musl iconv
's output isn't optimal, it's still correct.From commit 7d509878b8 ("
pretty.c
: format string with truncate respectslogOutputEncoding
", 2014-05-21, Git v2.1.0-rc0 -- merge listed in batch #3), we're encoding the message to utf-8 first, then format it and convert the message to the actual output encoding ongit commit --squash
.Thus,
t3900::test_commit_autosquash_flags
is failing onmusl libc
.Reencode to utf-8 before arranging rebase's todo list.
configure.ac
: defineICONV_OMITS_BOM
if necessarySigned-off-by: Doan Tran Cong Danh
From commit 79444c9294 ("
utf8
: handle systems that don't write BOM for UTF-16", 2019-02-12, Git v2.21.0-rc1 -- merge listed in batch #0), we're supporting those systems withiconv
that omits BOM with:make ICONV_OMITS_BOM=Yes
However, configure script wasn't taught to detect those systems.
Teach configure to do so.