diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-25 11:45:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 11:45:32 -0700 |
| commit | ad5d8939078a50c247e259cdc1b6d615b233bf47 (patch) | |
| tree | 3c44315949a7ff1cfd601a0679378bfb3676e47b /Documentation/git-show-branch.txt | |
| parent | Merge branch 'jc/revision-dash-count-parsing' into maint (diff) | |
| parent | pretty.c: format string with truncate respects logOutputEncoding (diff) | |
| download | tgif-ad5d8939078a50c247e259cdc1b6d615b233bf47.tar.xz | |
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
Diffstat (limited to 'Documentation/git-show-branch.txt')
0 files changed, 0 insertions, 0 deletions