Skip to contentSkip to conversation

diff: Only count lines in show_shortstats()]

PATCH Alexander Strasser 3 participants 5 messages Jun 15, 2016 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20120607122149.GA3070@akuma

#1 lore raw
Quoted 4 lines · Alexander Strasser

Hello Zbigniew,

could you have a look at the patch below? I submitted to it to the
Git mailing list and you could probably comment there?

Hi Alexander,
sure, thanks for finding (and fixing) the bug.

Quoted 2 lines

I think I should have put you in CC. But I am not so sure about
Git patch submission policies.

The policy is to CC everyone who might be interested, and also to add TO:[email protected], if the patch is intended for merging, as yours is. So basically taking the address list from the discussion of e18872b would be the simplest and most effective choice.

Quoted 4 lines

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.

Yeah, it seems that the condition for !binary was lost in the refactoring of the code.

Quoted 1 line

Small note: normally the paragraphs are not indented.

Quoted 30 lines

---

I hope this does retain the original intent of e18872b while
not messing up the insertions/deletions output by --shortstat.

Output of --stat was never affected AFAICT.

 diff.c                 | 2 +-
 t/t4012-diff-binary.sh | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
diff.c +1 -1
index 77edd50..1a594df 100644
@@ -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;
 		}
t/t4012-diff-binary.sh +0 -0
index 8b4e80d..1a994f0 100755
@@ -36,6 +36,14 @@ test_expect_success '"apply --stat" output for binary file change' '
 	test_i18ncmp expected current

t/t4012-diff-binary.sh test_expect_success '"apply --stat" output for binary file change' ' · line 46

Quoted 10 lines
t/t4012-diff-binary.sh +8 -0
 '
 
+cat > expected <<\EOF
+ 4 files changed, 2 insertions(+), 2 deletions(-)
+EOF
+test_expect_success 'diff with --shortstat' '
+	git diff --shortstat >current &&
+	test_cmp expected current
+'
+

The test is OK, and follows the style of surrounding tests, but current style is slightly different:
- no space after '>'
- expected output is inlined if it is short
- test_i18ncmp is used, even if the message is not yet i18n-ized

Something like this:
test_expect_success 'diff --shortstat output for binary file change' '

	echo " 4 files changed, 2 insertions(+), 2 deletions(-)" >expect &&
	git diff --shortstat >current &&
	test_i18ncmp expect current

'

t/t4012-diff-binary.sh test_expect_success '"apply --stat" output for binary file change' ' · line 49

Quoted 3 lines
t/t4012-diff-binary.sh +0 -0
 test_expect_success 'apply --numstat notices binary file change' '
 	git diff >diff &&
 	git apply --numstat <diff >current &&

Zbyszek

#2 lore raw

Hi,

Quoted 5 lines · Zbigniew Jędrzejewski-Szmek
Quoted 2 lines · Alexander Strasser

could you have a look at the patch below? I submitted to it to the
Git mailing list and you could probably comment there?

Hi Alexander,
sure, thanks for finding (and fixing) the bug.

thank you very much for the review.

Quoted 6 lines
Quoted 2 lines

I think I should have put you in CC. But I am not so sure about
Git patch submission policies.

The policy is to CC everyone who might be interested, and also to add TO:[email protected], if the patch is intended for merging, as yours is. So basically taking the address list from the discussion of e18872b would be the simplest and most effective choice.

Ah, I see. I will try to do better next time. Thanks for the good
explanation.

Quoted 6 lines
Quoted 4 lines

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.

Yeah, it seems that the condition for !binary was lost in the refactoring of the code.

Yes, seems so. I was seeing changing line counts in GitStats output
compared to older and newer Git versions. I found the exact commit with "git bisect" which was a big help.

Quoted 2 lines
Quoted 1 line

Small note: normally the paragraphs are not indented.

Noted. I probably should have also dropped the () in the subject. After
submitting I noticed this notation was not used in analog log messages.

[...]

Quoted 20 lines
Quoted 4 lines
t/t4012-diff-binary.sh +0 -0
@@ -36,6 +36,14 @@ test_expect_success '"apply --stat" output for binary file change' '
 	test_i18ncmp expected current

t/t4012-diff-binary.sh test_expect_success '"apply --stat" output for binary file change' ' · line 46

Quoted 10 lines
t/t4012-diff-binary.sh +8 -0
 '
 
+cat > expected <<\EOF
+ 4 files changed, 2 insertions(+), 2 deletions(-)
+EOF
+test_expect_success 'diff with --shortstat' '
+	git diff --shortstat >current &&
+	test_cmp expected current
+'
+

The test is OK, and follows the style of surrounding tests, but current style is slightly different:
- no space after '>'
- expected output is inlined if it is short
- test_i18ncmp is used, even if the message is not yet i18n-ized

Quoted 6 lines

Something like this:
test_expect_success 'diff --shortstat output for binary file change' '

	echo " 4 files changed, 2 insertions(+), 2 deletions(-)" >expect &&
	git diff --shortstat >current &&
	test_i18ncmp expect current

'

Should I rewrite the test for this patch? Or should it be changed for the
whole file at once?

[...]

Alexander

#3 lore raw

Alexander Strasser <[email protected]> writes:

Administrivia.

Please do not use Mail-Followup-To header to deflect direct response to you away to other people. When I want to reply to you and Cc others, I do not want to see other people's name on To field for me to edit and correct, and when somebody else wants to reply to you, I do not want to see my name on its To line, as such a message may not be of immediate interest for me.

Quoted 6 lines

Zbigniew Jędrzejewski-Szmek wrote:
...

Quoted 4 lines
Quoted 2 lines

I think I should have put you in CC. But I am not so sure about
Git patch submission policies.

The policy is to CC everyone who might be interested, and also to add TO:[email protected], if the patch is intended for merging, as yours is.

Correction. It is not "is intended for merging", but only when it is *ready* to be merged, when stakeholders are happy with the patch.

Quoted 6 lines
Quoted 2 lines

So basically taking the address list from the discussion of e18872b would be the simplest and most effective choice.

Yes, seems so. I was seeing changing line counts in GitStats output
compared to older and newer Git versions. I found the exact commit with "git bisect" which was a big help.

Thanks.

Quoted 34 lines
Quoted 2 lines
Quoted 1 line

Small note: normally the paragraphs are not indented.

Noted. I probably should have also dropped the () in the subject. After
submitting I noticed this notation was not used in analog log messages.

[...]

Quoted 20 lines
Quoted 4 lines
t/t4012-diff-binary.sh +0 -0
@@ -36,6 +36,14 @@ test_expect_success '"apply --stat" output for binary file change' '
 	test_i18ncmp expected current

t/t4012-diff-binary.sh test_expect_success '"apply --stat" output for binary file change' ' · line 46

Quoted 10 lines
t/t4012-diff-binary.sh +8 -0
 '
 
+cat > expected <<\EOF
+ 4 files changed, 2 insertions(+), 2 deletions(-)
+EOF
+test_expect_success 'diff with --shortstat' '
+	git diff --shortstat >current &&
+	test_cmp expected current
+'
+

The test is OK, and follows the style of surrounding tests, but current style is slightly different:
- no space after '>'
- expected output is inlined if it is short
- test_i18ncmp is used, even if the message is not yet i18n-ized

Quoted 6 lines

Something like this:
test_expect_success 'diff --shortstat output for binary file change' '

	echo " 4 files changed, 2 insertions(+), 2 deletions(-)" >expect &&
	git diff --shortstat >current &&
	test_i18ncmp expect current

'

Quoted 2 lines

Should I rewrite the test for this patch? Or should it be changed for the
whole file at once?

Please keep a bugfix patch to only fixes with tests. Style fixes should be done later after dust from more important changes (e.g. a bugfix) settles.

Thanks.

#4 lore raw
Quoted 27 lines · Junio C Hamano
Quoted 27 lines
Quoted 27 lines
Quoted 26 lines
Quoted 26 lines
Quoted 6 lines
Quoted 6 lines
t/t4012-diff-binary.sh +0 -0
@@ -36,6 +36,14 @@ test_expect_success '"apply --stat" output for binary file change' '
 	test_i18ncmp expected current
 '
 
Quoted 8 lines

t/t4012-diff-binary.sh test_expect_success '"apply --stat" output for binary file change' ' · line 46

Quoted 8 lines
t/t4012-diff-binary.sh +8 -0
+cat > expected <<\EOF
+ 4 files changed, 2 insertions(+), 2 deletions(-)
+EOF
+test_expect_success 'diff with --shortstat' '
+	git diff --shortstat >current &&
+	test_cmp expected current
+'
+

The test is OK, and follows the style of surrounding tests, but current style is slightly different:
- no space after '>'
- expected output is inlined if it is short
- test_i18ncmp is used, even if the message is not yet i18n-ized

Something like this:
test_expect_success 'diff --shortstat output for binary file change' '

	echo " 4 files changed, 2 insertions(+), 2 deletions(-)" >expect &&
	git diff --shortstat >current &&
	test_i18ncmp expect current

'

Quoted 7 lines
Quoted 2 lines
Quoted 2 lines

Should I rewrite the test for this patch? Or should it be changed for the
whole file at once?

Please keep a bugfix patch to only fixes with tests. Style fixes should be done later after dust from more important changes (e.g. a bugfix) settles.

Thanks.

Does this need a v2?

Zbyszek

#5 lore raw
Quoted 11 lines · Zbigniew Jędrzejewski-Szmek

On 06/07/2012 10:29 PM, Junio C Hamano wrote:
...

Quoted 5 lines

Please keep a bugfix patch to only fixes with tests. Style fixes should be done later after dust from more important changes (e.g. a bugfix) settles.

Thanks.

Does this need a v2?

Zbyszek

That is a question to be asked with Alex on the To: line, not me, I would think. I saw "Ah, I see. I will try to do better next time." in his response to your review, but haven't seen the "next time" reroll yet.