diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:21 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:21 -0800 |
commit | 0fa3cc77ee9fb3b6bb53c73688c9b7500f996b83 (patch) | |
tree | ace8383345c2e54c9aea265f06e3612438351007 /compat | |
parent | cfd9167c15e7b09f3964204964a4c158108c6403 (diff) | |
parent | aab2a1ae48ff65781a5379a01a4abb4f75e5641d (diff) | |
download | git-0fa3cc77ee9fb3b6bb53c73688c9b7500f996b83.tar.gz |
Merge branch 'tb/utf-16-le-with-explicit-bom'
A new encoding UTF-16LE-BOM has been invented to force encoding to
UTF-16 with BOM in little endian byte order, which cannot be directly
generated by using iconv.
* tb/utf-16-le-with-explicit-bom:
Support working-tree-encoding "UTF-16LE-BOM"
Diffstat (limited to 'compat')
-rw-r--r-- | compat/precompose_utf8.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c index de61c15d34..136250fbf6 100644 --- a/compat/precompose_utf8.c +++ b/compat/precompose_utf8.c @@ -79,7 +79,7 @@ void precompose_argv(int argc, const char **argv) size_t namelen; oldarg = argv[i]; if (has_non_ascii(oldarg, (size_t)-1, &namelen)) { - newarg = reencode_string_iconv(oldarg, namelen, ic_precompose, NULL); + newarg = reencode_string_iconv(oldarg, namelen, ic_precompose, 0, NULL); if (newarg) argv[i] = newarg; } |