summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorAlexander Strasser <eclipse7@gmx.net>2012-06-15 21:50:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-06-15 22:00:04 (GMT)
commitde9658b511377e9eaa2c58a8c3885a1a01b94be8 (patch)
tree4cdba7ec3c345e2e6f63a54fa8cce5c5cfcfa0fb /diff.c
parente18872b2f0fba4cb860c9350bb8b8d8680dfc83b (diff)
downloadgit-de9658b511377e9eaa2c58a8c3885a1a01b94be8.zip
git-de9658b511377e9eaa2c58a8c3885a1a01b94be8.tar.gz
git-de9658b511377e9eaa2c58a8c3885a1a01b94be8.tar.bz2
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index e61ccd1..ac624c4 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;
}