aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-15 15:00:53 -0700
committerJunio C Hamano <gitster@pobox.com>2012-06-15 15:00:53 -0700
commit0b6e913c8be236ba801b49d21490409f13af7cd9 (patch)
treeafae79287a2430befe80ce32d44768afa94bd76c /diff.c
parent1fd8f97f6e2c5f928e7399adb59b6d87ac82eb08 (diff)
parentde9658b511377e9eaa2c58a8c3885a1a01b94be8 (diff)
downloadgit-0b6e913c8be236ba801b49d21490409f13af7cd9.tar.gz
git-0b6e913c8be236ba801b49d21490409f13af7cd9.tar.xz
Merge branch 'as/diff-shortstat-ignore-binary'
# By Alexander Strasser * as/diff-shortstat-ignore-binary: diff: Only count lines in show_shortstats
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 77edd5086..1a594df4f 100644
--- a/diff.c
+++ b/diff.c
@@ -1700,7 +1700,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;
}