[PATCH v3 1/2] diff: Only count lines in show_shortstats
- From
Alexander Strasser <eclipse7@gmx.net>
- Date
- Jun 15, 2012, 21:50 UTC
- Message-ID
- <eae8caaf80d3bc90051de3f8f022bda01016bfd8.1339796363.git.eclipse7@gmx.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