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@xxxxxxx>
---
Zbigniew, Junio:
I hope I did submit the patch correctly this time.
This is a reroll with the following differences to v1:
* I changed the additional test for t4012 to adhere to modern
style on request by Zbigniew. I had the impression this might
be in conflict with Junio's comment
"Style fixes should be done later after dust from more important
changes (e.g. a bugfix) settles."
But maybe that was directed at modernizing the remaining of
parts of that test file.
* I deleted the 2-space indent in the commit message paragraphs
* I omitted the parenthesis in the subject message
The above points are the reason I resent this for discussion to
the list.
I apologize for the long delay, some misunderstandings on my side
made me think the initial submission was considered for inclusion.
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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html