Merge branch 'ls/packet-line-protocol-doc-fix' into maint

diff --git a/log-tree.c b/log-tree.c
index 60f983934d5ea2c8e276d2c493d78caf56e9a39a..8d393150c094f55638e4035e9c6121973d3ce9db 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -683,9 +683,12 @@ void show_log(struct rev_info *opt)
        ctx.fmt = opt->commit_format;
        ctx.mailmap = opt->mailmap;
        ctx.color = opt->diffopt.use_color;
+       ctx.expand_tabs_in_log = opt->expand_tabs_in_log;
        ctx.output_encoding = get_log_output_encoding();
        if (opt->from_ident.mail_begin && opt->from_ident.name_begin)
                ctx.from_ident = &opt->from_ident;
+       if (opt->graph)
+               ctx.graph_width = graph_width(opt->graph);
        pretty_print_commit(&ctx, commit, &msgbuf);
 
        if (opt->add_signoff)