From: Lucian Poston Date: Mon, 16 Apr 2012 10:44:51 +0000 (-0700) Subject: Adjust stat width calculations to take --graph output into account X-Git-Tag: v1.7.10.2~20^2~5 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3f1451326a09a4e36c10feff65685daef1d29c32;p=git.git Adjust stat width calculations to take --graph output into account 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 Signed-off-by: Junio C Hamano --- diff --git a/diff.c b/diff.c index 377ec1ea4..0b61cf7c7 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;