Merge branch 'as/diff-shortstat-ignore-binary'

gitster · gitster · commit 0b6e913c8be2 · 2012-06-15T15:00:53.000-07:00
# By Alexander Strasser
* as/diff-shortstat-ignore-binary:
  diff: Only count lines in show_shortstats
diff --git 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
@@ -36,6 +36,18 @@ 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 '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 &&

Original file line number	Diff line number	Diff line change
`@@ -1700,7 +1700,7 @@ static void show_shortstats(struct diffstat_t data, struct diff_options option`
`1700`	`1700`	`continue;`
`1701`	`1701`	`if (!data->files[i]->is_renamed && (added + deleted == 0)) {`
`1702`	`1702`	`total_files--;`
`1703`		`- } else {`
	`1703`	`+ } else if (!data->files[i]->is_binary) { /* don't count bytes */`
`1704`	`1704`	`adds += added;`
`1705`	`1705`	`dels += deleted;`
`1706`	`1706`	`}`