[PATCH v3 3/7] Adjust stat width calculations to take --graph output into account

From: Lucian Poston <lucian.poston@gmail.com>
Date: Apr 16, 2012, 10:44 UTC
Message-ID: <1334573095-32286-4-git-send-email-lucian.poston@gmail.com>
In-Reply-To: <1334573095-32286-1-git-send-email-lucian.poston@gmail.com>

The recent change to compute the width of diff --stat did not take into consideration the output from --graph. The consequence is that when both options are used, e.g. in 'log --stat --graph', the lines are too long.

Adjust stat width calculations to take --graph output into account.

Signed-off-by: Lucian Poston <lucian.poston@gmail.com>
---
 diff.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/diff.c b/diff.c
index 377ec1e..0b61cf7 100644
--- a/diff.c
+++ b/diff.c
@@ -1445,7 +1445,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
 	 */
 
 	if (options->stat_width == -1)
-		width = term_columns();
+		width = term_columns() - options->output_prefix_length;
 	else
 		width = options->stat_width ? options->stat_width : 80;

-- 
1.7.3.4