From de9658b511377e9eaa2c58a8c3885a1a01b94be8 Mon Sep 17 00:00:00 2001 From: Alexander Strasser Date: Fri, 15 Jun 2012 23:50:30 +0200 Subject: [PATCH] diff: Only count lines in show_shortstats 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 Signed-off-by: Junio C Hamano --- diff.c | 2 +- t/t4012-diff-binary.sh | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/diff.c b/diff.c index e61ccd1123..ac624c477c 100644 --- a/diff.c +++ b/diff.c @@ -1668,7 +1668,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 ed24ddd88a..e6379f2d82 100755 --- 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 current && -- 2.11.4.GIT