diff options
| author |  Alexey Shumkin <alex.crezoff@gmail.com> | 2014-05-21 17:20:07 +0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-05-21 11:13:30 -0700 |
| commit | 7d509878b845a2a895cc880b833a016a06199981 (patch) | |
| tree | 5e40401d011a00f8e5ebf676213d80e5a492c5db /diff-delta.c | |
| parent | t4205, t6006: add tests that fail with i18n.logOutputEncoding set (diff) | |
| download | tgif-7d509878b845a2a895cc880b833a016a06199981.tar.xz | |
pretty.c: format string with truncate respects logOutputEncoding
Pretty format string %<(N,[ml]trunc)>%s truncates subject to a given
length with an appropriate padding. This works for non-ASCII texts when
i18n.logOutputEncoding is UTF-8 only (independently of a printed commit
message encoding) but does not work when i18n.logOutputEncoding is NOT
UTF-8.
In 7e77df3 (pretty: two phase conversion for non utf-8 commits, 2013-04-19)
'format_commit_item' function assumes commit message to be in UTF-8.
And that was so until ecaee80 (pretty: --format output should honor
logOutputEncoding, 2013-06-26) where conversion to logOutputEncoding was
added before calling 'format_commit_message'.
Correct this by converting a commit message to UTF-8 first (as it
assumed in 7e77df3 (pretty: two phase conversion for non utf-8 commits,
2013-04-19)). Only after that convert a commit message to an actual
logOutputEncoding.
Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com>
Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-delta.c')
0 files changed, 0 insertions, 0 deletions