# [PATCH v3 1/2] diff: Only count lines in show_shortstats

3 messages from 2012-06-15 to 2012-06-15. Participants: Alexander Strasser, Junio C Hamano.
Thread: https://gitlist.dev/t/30823

## Alexander Strasser, 2012-06-15 21:50

Subject: [PATCH v3 1/2] diff: Only count lines in show_shortstats
Message-ID: <eae8caaf80d3bc90051de3f8f022bda01016bfd8.1339796363.git.eclipse7@gmx.net>
URL: https://gitlist.dev/e/eae8caaf80d3bc90051de3f8f022bda01016bfd8.1339796363.git.eclipse7%40gmx.net

```
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>
---
 diff.c                 | 2 +-
 t/t4012-diff-binary.sh | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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..7d03c1d 100755
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -36,6 +36,12 @@ test_expect_success '"apply --stat" output for binary file change' '
 	test_i18ncmp expected current
 '
 
+test_expect_success 'diff --shortstat output for binary file change' '
+	echo " 4 files changed, 2 insertions(+), 2 deletions(-)" >expected &&
+	git diff --shortstat >current &&
+	test_i18ncmp 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

```

## Alexander Strasser, 2012-06-15 21:51

Subject: [PATCH v3 2/2] t4012: Check binary only change with --shortstat
Message-ID: <3fe3171f891450f6a7ecc04051f4c0c5e467df3d.1339796363.git.eclipse7@gmx.net>
URL: https://gitlist.dev/e/3fe3171f891450f6a7ecc04051f4c0c5e467df3d.1339796363.git.eclipse7%40gmx.net
In-Reply-To: <eae8caaf80d3bc90051de3f8f022bda01016bfd8.1339796363.git.eclipse7@gmx.net>

```
Expect to see files changed but with 0 insertions and 0 deletions,
because we do not count line changes for binary file modifications.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
---

  This patch can be squashed into the first one if desirable.

 t/t4012-diff-binary.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index 7d03c1d..6cebb39 100755
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -42,6 +42,12 @@ test_expect_success 'diff --shortstat output for binary file change' '
 	test_i18ncmp expected current
 '
 
+test_expect_success 'diff --shortstat output for binary file change only' '
+	echo " 1 file changed, 0 insertions(+), 0 deletions(-)" >expected &&
+	git diff --shortstat -- b >current &&
+	test_i18ncmp 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

```

## Junio C Hamano, 2012-06-15 22:00

Subject: Re: [PATCH v3 1/2] diff: Only count lines in show_shortstats
Message-ID: <7vpq908cc8.fsf@alter.siamese.dyndns.org>
URL: https://gitlist.dev/e/7vpq908cc8.fsf%40alter.siamese.dyndns.org
In-Reply-To: <eae8caaf80d3bc90051de3f8f022bda01016bfd8.1339796363.git.eclipse7@gmx.net>

```
Alexander Strasser <eclipse7@gmx.net> writes:

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

Thanks for a last-minute fix.  Will apply directly to 'master'.

```