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 --- commit.h | 1 + 1 file changed, 1 insertion(+) (limited to 'commit.h') diff --git a/commit.h b/commit.h index b06db4d5d..0c923f05f 100644 --- a/commit.h +++ b/commit.h @@ -161,6 +161,7 @@ struct pretty_print_context { * should not be counted on by callers. */ struct string_list in_body_headers; + int graph_width; }; struct userformat_want { -- cgit v1.2.1