| commit | ad5d8939078a50c247e259cdc1b6d615b233bf47 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 18:45:31 +0000 (25 11:45 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 18:45:32 +0000 (25 11:45 -0700) | ||
| tree | 3c44315949a7ff1cfd601a0679378bfb3676e47b | treesnapshot (tar.gz zip) |
| parent | 91043fc95c20e03b1827b86498b7966349dd9ffe | commitdiff |
| parent | 7d509878b845a2a895cc880b833a016a06199981 | commitdiff |
Merge branch 'as/pretty-truncate' into maint
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
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