Merge branch 'as/pretty-truncate' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:45:31 +0000 (11:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:45:32 +0000 (11:45 -0700)
The "%<(10,trunc)%s" pretty format specifier in the log family of
commands is used to truncate the string to a given length (e.g. 10
in the example) with padding to column-align the output, but did
not take into account that number of bytes and number of display
columns are different.

* as/pretty-truncate:
pretty.c: format string with truncate respects logOutputEncoding
t4205, t6006: add tests that fail with i18n.logOutputEncoding set
t4205 (log-pretty-format): use `tformat` rather than `format`
t4041, t4205, t6006, t7102: don't hardcode tested encoding value
t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs

Trivial merge