diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-06-15 15:00:53 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-06-15 15:00:53 -0700 |
commit | 0b6e913c8be236ba801b49d21490409f13af7cd9 (patch) | |
tree | afae79287a2430befe80ce32d44768afa94bd76c /diff.c | |
parent | 1fd8f97f6e2c5f928e7399adb59b6d87ac82eb08 (diff) | |
parent | de9658b511377e9eaa2c58a8c3885a1a01b94be8 (diff) | |
download | git-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.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; } |