From de9658b511377e9eaa2c58a8c3885a1a01b94be8 Mon Sep 17 00:00:00 2001 From: Alexander Strasser Date: Fri, 15 Jun 2012 23:50:30 +0200 Subject: diff: Only count lines in show_shortstats Do not mix byte and line counts. Binary files have byte counts; skip them when accumulating line insertions/deletions. The regression was introduced in e18872b. Signed-off-by: Alexander Strasser Signed-off-by: Junio C Hamano --- diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'diff.c') diff --git a/diff.c b/diff.c index e61ccd1123..ac624c477c 100644 --- a/diff.c +++ b/diff.c @@ -1668,7 +1668,7 @@ static void show_shortstats(struct diffstat_t *data, struct diff_options *option continue; if (!data->files[i]->is_renamed && (added + deleted == 0)) { total_files--; - } else { + } else if (!data->files[i]->is_binary) { /* don't count bytes */ adds += added; dels += deleted; } -- cgit v1.2.1