[PATCH] diff: Only count lines in show_shortstats()

Alexander Strasser· May 30, 2012, 21:58 UTC · lore

  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>
---

  I hope this does retain the original intent of e18872b while
not messing up the insertions/deletions output by --shortstat.

  Output of --stat was never affected AFAICT.

 diff.c                 | 2 +-
 t/t4012-diff-binary.sh | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

Show changes to 2 files +9 −1

diff.c, t/t4012-diff-binary.sh

diff --git a/diff.c b/diff.c
index 77edd50..1a594df 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;
 		}
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index 8b4e80d..1a994f0 100755
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -36,6 +36,14 @@ test_expect_success '"apply --stat" output for binary file change' '
 	test_i18ncmp expected current
 '
 
+cat > expected <<\EOF
+ 4 files changed, 2 insertions(+), 2 deletions(-)
+EOF
+test_expect_success 'diff with --shortstat' '
+	git diff --shortstat >current &&
+	test_cmp expected current
+'
+
 test_expect_success 'apply --numstat notices binary file change' '
 	git diff >diff &&
 	git apply --numstat <diff >current &&

-- 
1.7.10.2.552.gaa3bb87

patchdiff: Only count lines in show_shortstats()