summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-06 20:38:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-07-06 20:38:12 (GMT)
commitf2140c3890780301760ee290f21be01f61726221 (patch)
treefe441f41a0fa1c572c3f672fb2abdac32c61966a /log-tree.c
parent979f030359f6830fbaebd0c76e9aad5f86993fef (diff)
parent066790d7cb0fa22e64f1276d8a0e33d18484f62a (diff)
downloadgit-f2140c3890780301760ee290f21be01f61726221.zip
git-f2140c3890780301760ee290f21be01f61726221.tar.gz
git-f2140c3890780301760ee290f21be01f61726221.tar.bz2
Merge branch 'nd/graph-width-padded'
"log --graph --format=" learned that "%>|(N)" specifies the width relative to the terminal's left edge, not relative to the area to draw text that is to the right of the ancestry-graph section. It also now accepts negative N that means the column limit is relative to the right border. * nd/graph-width-padded: pretty.c: support <direction>|(<negative number>) forms pretty: pass graph width to pretty formatting for use in '%>|(N)'
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/log-tree.c b/log-tree.c
index 48daf84..9f678ab 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -687,6 +687,8 @@ void show_log(struct rev_info *opt)
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)