diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-12 12:04:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-12 12:04:01 -0700 |
| commit | 8a6482227ca31bd582aecbd211b85ff76595d0a7 (patch) | |
| tree | 6f425dad28a02232a333bd04189af809b2366c6d /log-tree.c | |
| parent | dacd2bcc414e0b7aac36aaa400da0a743c4741cc (diff) | |
| parent | 37eb772ef3a5da0b28d3759373d714b349306ea4 (diff) | |
| download | git-8a6482227ca31bd582aecbd211b85ff76595d0a7.tar.gz git-8a6482227ca31bd582aecbd211b85ff76595d0a7.tar.xz | |
Merge branch 'as/log-output-encoding-in-user-format'
"log --format=" did not honor i18n.logoutputencoding configuration
and this attempts to fix it.
* as/log-output-encoding-in-user-format:
t4205 (log-pretty-formats): avoid using `sed`
t6006 (rev-list-format): add tests for "%b" and "%s" for the case i18n.commitEncoding is not set
t4205, t6006, t7102: make functions better readable
t4205 (log-pretty-formats): revert back single quotes
t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1
t4205: replace .\+ with ..* in sed commands
pretty: --format output should honor logOutputEncoding
pretty: Add failing tests: --format output should honor logOutputEncoding
t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
t7102 (reset): don't hardcode SHA-1 in expected outputs
t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/log-tree.c b/log-tree.c index 2eb69bcfe..60f32a396 100644 --- a/log-tree.c +++ b/log-tree.c @@ -617,6 +617,7 @@ void show_log(struct rev_info *opt) ctx.fmt = opt->commit_format; ctx.mailmap = opt->mailmap; ctx.color = opt->diffopt.use_color; + ctx.output_encoding = get_log_output_encoding(); pretty_print_commit(&ctx, commit, &msgbuf); if (opt->add_signoff) |