From 3ad87c807c2b6cbfbdfb2c78412781ecc7db593d Mon Sep 17 00:00:00 2001 From: Josef Kufner Date: Thu, 16 Jun 2016 20:18:37 +0700 Subject: pretty: pass graph width to pretty formatting for use in '%>|(N)' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- graph.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'graph.h') diff --git a/graph.h b/graph.h index 0be62bd8b1..3f48c19b62 100644 --- a/graph.h +++ b/graph.h @@ -67,6 +67,11 @@ int graph_is_commit_finished(struct git_graph const *graph); int graph_next_line(struct git_graph *graph, struct strbuf *sb); +/* + * Return current width of the graph in on-screen characters. + */ +int graph_width(struct git_graph *graph); + /* * graph_show_*: helper functions for printing to stdout */ -- cgit v1.2.3