diff options
author | Josef Kufner <josef@kufner.cz> | 2016-06-16 20:18:37 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-06-16 11:43:36 -0700 |
commit | 3ad87c807c2b6cbfbdfb2c78412781ecc7db593d (patch) | |
tree | e7b1ea6c6d9fa662be89d963317532a5e9663c63 /graph.c | |
parent | 05219a1276341e72d8082d76b7f5ed394b7437a4 (diff) | |
download | git-3ad87c807c2b6cbfbdfb2c78412781ecc7db593d.tar.gz |
pretty: pass graph width to pretty formatting for use in '%>|(N)'
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>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'graph.c')
-rw-r--r-- | graph.c | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -669,6 +669,13 @@ static void graph_output_padding_line(struct git_graph *graph, graph_pad_horizontally(graph, sb, graph->num_new_columns * 2); } + +int graph_width(struct git_graph *graph) +{ + return graph->width; +} + + static void graph_output_skip_line(struct git_graph *graph, struct strbuf *sb) { /* |