diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-16 10:07:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-16 10:07:12 -0700 |
| commit | 09e13ad5b0f0689418a723289dca7b3c72d538c4 (patch) | |
| tree | 370f325d1897f553d57e8e615b976e7668990616 /daemon.c | |
| parent | b0e2c999af7aa69a0b8d9677107d4c09938e528a (diff) | |
| parent | 7d509878b845a2a895cc880b833a016a06199981 (diff) | |
| download | git-09e13ad5b0f0689418a723289dca7b3c72d538c4.tar.gz | |
Merge branch 'as/pretty-truncate'
* 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 'daemon.c')
0 files changed, 0 insertions, 0 deletions