path: root/graph.c
diff options
authorJosef Kufner <>2016-06-16 13:18:37 (GMT)
committerJunio C Hamano <>2016-06-16 18:43:36 (GMT)
commit3ad87c807c2b6cbfbdfb2c78412781ecc7db593d (patch)
treee7b1ea6c6d9fa662be89d963317532a5e9663c63 /graph.c
parent05219a1276341e72d8082d76b7f5ed394b7437a4 (diff)
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 <> Signed-off-by: Junio C Hamano <> Signed-off-by: Nguyễn Thái Ngọc Duy <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'graph.c')
1 files changed, 7 insertions, 0 deletions
diff --git a/graph.c b/graph.c
index 1350bdd..ad766fa 100644
--- a/graph.c
+++ b/graph.c
@@ -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)