diff options
author | Alexander Strasser <eclipse7@gmx.net> | 2012-06-15 23:50:30 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-06-15 15:00:04 -0700 |
commit | de9658b511377e9eaa2c58a8c3885a1a01b94be8 (patch) | |
tree | 4cdba7ec3c345e2e6f63a54fa8cce5c5cfcfa0fb /diff.c | |
parent | diff --stat: report mode-only changes for binary files like text files (diff) | |
download | tgif-de9658b511377e9eaa2c58a8c3885a1a01b94be8.tar.xz |
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 <eclipse7@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; } |