diff options
| author | Josef Kufner <josef@kufner.cz> | 2015-09-12 01:25:11 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-14 13:02:47 -0700 |
| commit | c03fd1bd3a84a1923ef130f20ab0c01ec3d8c742 (patch) | |
| tree | 3dac1ec6c496a1323ac927fe4fdb3747cb13de93 /log-tree.c | |
| parent | 441c4a40173fe1ee8a5c0094e587dfc47e2a6460 (diff) | |
| download | git-jk/graph-format-padding.tar.gz | |
pretty: pass graph width to pretty formatting for use in '%>|(N)'jk/graph-format-padding
Pass graph width to pretty formatting, to make N in '%>|(N)'
include columns consumed by graph rendered when --graph option
is in use.
For example, in the output of
git log --all --graph --pretty='format: [%>|(20)%h] %ar%d'
this change will make all commit hashes align at 20th column from
the edge of the terminal, not from the edge of the graph.
Signed-off-by: Josef Kufner <josef@kufner.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/log-tree.c b/log-tree.c index 7f0890e4ac..a456ed015b 100644 --- a/log-tree.c +++ b/log-tree.c @@ -612,6 +612,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) |