mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff: Only count lines in show_shortstats

Browse Source 
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 <eclipse7@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alexander Strasser
2012-06-15 23:50:30 +02:00
committed by Junio C Hamano
parent e18872b2f0
commit de9658b511
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff.c
View File

@ -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;
}