Bug report: git log --[num|short]stat sometimes counts lines wrong

Bug report: git log --[num|short]stat sometimes counts lines wrong

[Alexander Pepper]

Hi there.
This is my first contribution to git (if you count a bug report as a contribution) and I'm not really familiar where to report bugs. In the irc channel #git at freenode somebody pointed me to this mailing list.

First of: I'm running git version 1.7.6 on OS X 10.6.8.

Let me describe what I observed.
repository: https://github.com/voldemort/voldemort.git
The command "git log --numstat c21ad764ea1bae7f7bd83b5e2cb015dcbc44d586" shows for the commit c21ad764 and file '.../readonly/mr/HadoopStoreBuilderReducer.java' 25 lines added and 22 lines removed. But the patch of HadoopStoreBuilderReducer.java that I get with "git show c21ad764ea1bae7f7bd83b5e2cb015dcbc44d586 -- contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilderReducer.java" adds 30 lines and removes 27.

Why does "git log --numstat" drops 5 added lines and 5 removed lines? This also holds true for "git log --stat" and "git log --shortstat".

Is this a bug or am I missing an option to git log or git show?

More commits where I observed this problem on the same repository:
7e00fb6d2cf131dfed59c180f2171952808cc336 src/java/voldemort/client/rebalance/MigratePartitions.java
78ad6f2a6ea327dbae2110f4530a5bd07e5deaac src/java/voldemort/client/rebalance/MigratePartitions.java (same commit on another branch)
7871933f0f0f056e2eeac03a01db1e9cf81f8bda src/java/voldemort/client/protocol/admin/AdminClient.java
2d6f68b09c3bdc23dcf3ae1f91c9285fbd668820 src/java/voldemort/store/readonly/ExternalSorter.java
6fcacee866307ec34eb32b268e2c2b885a949319 build.xml

Greetings from Berlin
Alex

Re: Bug report: git log --[num|short]stat sometimes counts lines wrong

[Alexander Pepper]

Am 12.08.2011 um 17:21 schrieb Alexander Pepper:
> Hi there.
> This is my first contribution to git (if you count a bug report as a contribution) and I'm not really familiar where to report bugs. In the irc channel #git at freenode somebody pointed me to this mailing list.
> 
> First of: I'm running git version 1.7.6 on OS X 10.6.8.
> 
> Let me describe what I observed.
> repository: https://github.com/voldemort/voldemort.git
> The command "git log --numstat c21ad764ea1bae7f7bd83b5e2cb015dcbc44d586" shows for the commit c21ad764 and file '.../readonly/mr/HadoopStoreBuilderReducer.java' 25 lines added and 22 lines removed. But the patch of HadoopStoreBuilderReducer.java that I get with "git show c21ad764ea1bae7f7bd83b5e2cb015dcbc44d586 -- contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilderReducer.java" adds 30 lines and removes 27.
> 
> Why does "git log --numstat" drops 5 added lines and 5 removed lines? This also holds true for "git log --stat" and "git log --shortstat".
> 
> Is this a bug or am I missing an option to git log or git show?
> 
> More commits where I observed this problem on the same repository:
> 7e00fb6d2cf131dfed59c180f2171952808cc336 src/java/voldemort/client/rebalance/MigratePartitions.java
> 78ad6f2a6ea327dbae2110f4530a5bd07e5deaac src/java/voldemort/client/rebalance/MigratePartitions.java (same commit on another branch)
> 7871933f0f0f056e2eeac03a01db1e9cf81f8bda src/java/voldemort/client/protocol/admin/AdminClient.java
> 2d6f68b09c3bdc23dcf3ae1f91c9285fbd668820 src/java/voldemort/store/readonly/ExternalSorter.java
> 6fcacee866307ec34eb32b268e2c2b885a949319 build.xml
> 
> Greetings from Berlin
> Alex

Hello again.

I also observed this behavior with git version 1.7.4.1 on Gentoo.

Any ideas how to fix this?

Greetings from Berlin
Alex

Re: Bug report: git log --[num|short]stat sometimes counts lines wrong

[Carlos Martín Nieto]

[-- Attachment #1: Type: text/plain, Size: 2190 bytes --]

On Mon, 2011-08-15 at 10:24 +0200, Alexander Pepper wrote:
> Am 12.08.2011 um 17:21 schrieb Alexander Pepper:
> > Hi there.
> > This is my first contribution to git (if you count a bug report as a contribution) and I'm not really familiar where to report bugs. In the irc channel #git at freenode somebody pointed me to this mailing list.
> > 
> > First of: I'm running git version 1.7.6 on OS X 10.6.8.
> > 
> > Let me describe what I observed.
> > repository: https://github.com/voldemort/voldemort.git
> > The command "git log --numstat c21ad764ea1bae7f7bd83b5e2cb015dcbc44d586" shows for the commit c21ad764 and file '.../readonly/mr/HadoopStoreBuilderReducer.java' 25 lines added and 22 lines removed. But the patch of HadoopStoreBuilderReducer.java that I get with "git show c21ad764ea1bae7f7bd83b5e2cb015dcbc44d586 -- contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilderReducer.java" adds 30 lines and removes 27.
> > 
> > Why does "git log --numstat" drops 5 added lines and 5 removed lines? This also holds true for "git log --stat" and "git log --shortstat".
> > 
> > Is this a bug or am I missing an option to git log or git show?
> > 
> > More commits where I observed this problem on the same repository:
> > 7e00fb6d2cf131dfed59c180f2171952808cc336 src/java/voldemort/client/rebalance/MigratePartitions.java
> > 78ad6f2a6ea327dbae2110f4530a5bd07e5deaac src/java/voldemort/client/rebalance/MigratePartitions.java (same commit on another branch)
> > 7871933f0f0f056e2eeac03a01db1e9cf81f8bda src/java/voldemort/client/protocol/admin/AdminClient.java
> > 2d6f68b09c3bdc23dcf3ae1f91c9285fbd668820 src/java/voldemort/store/readonly/ExternalSorter.java
> > 6fcacee866307ec34eb32b268e2c2b885a949319 build.xml
> > 
> > Greetings from Berlin
> > Alex
> 
> Hello again.
> 
> I also observed this behavior with git version 1.7.4.1 on Gentoo.
> 
> Any ideas how to fix this?

I've just checked and `git show --stat` does give different numbers from
`git show | diffstat`. Git ignores (or can ignore) empty lines in
several contexts, have you checked to see if there are 5 empty lines
added and removed?

Cheers,
   cmn

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

Re: Bug report: git log --[num|short]stat sometimes counts lines wrong

[Alexander Pepper]

Am 15.08.2011 um 17:26 schrieb Carlos Martín Nieto:
> On Mon, 2011-08-15 at 10:24 +0200, Alexander Pepper wrote:
>> Am 12.08.2011 um 17:21 schrieb Alexander Pepper:
>>> Hi there.
>>> This is my first contribution to git (if you count a bug report as a contribution) and I'm not really familiar where to report bugs. In the irc channel #git at freenode somebody pointed me to this mailing list.
>>> 
>>> First of: I'm running git version 1.7.6 on OS X 10.6.8.
>>> 
>>> Let me describe what I observed.
>>> repository: https://github.com/voldemort/voldemort.git
>>> The command "git log --numstat c21ad764ea1bae7f7bd83b5e2cb015dcbc44d586" shows for the commit c21ad764 and file '.../readonly/mr/HadoopStoreBuilderReducer.java' 25 lines added and 22 lines removed. But the patch of HadoopStoreBuilderReducer.java that I get with "git show c21ad764ea1bae7f7bd83b5e2cb015dcbc44d586 -- contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilderReducer.java" adds 30 lines and removes 27.
>>> 
>>> Why does "git log --numstat" drops 5 added lines and 5 removed lines? This also holds true for "git log --stat" and "git log --shortstat".
>>> 
>>> Is this a bug or am I missing an option to git log or git show?
>>> 
>>> More commits where I observed this problem on the same repository:
>>> 7e00fb6d2cf131dfed59c180f2171952808cc336 src/java/voldemort/client/rebalance/MigratePartitions.java
>>> 78ad6f2a6ea327dbae2110f4530a5bd07e5deaac src/java/voldemort/client/rebalance/MigratePartitions.java (same commit on another branch)
>>> 7871933f0f0f056e2eeac03a01db1e9cf81f8bda src/java/voldemort/client/protocol/admin/AdminClient.java
>>> 2d6f68b09c3bdc23dcf3ae1f91c9285fbd668820 src/java/voldemort/store/readonly/ExternalSorter.java
>>> 6fcacee866307ec34eb32b268e2c2b885a949319 build.xml
>>> 
>>> Greetings from Berlin
>>> Alex
>> 
>> Hello again.
>> 
>> I also observed this behavior with git version 1.7.4.1 on Gentoo.
>> 
>> Any ideas how to fix this?
> 
> I've just checked and `git show --stat` does give different numbers from
> `git show | diffstat`. Git ignores (or can ignore) empty lines in
> several contexts, have you checked to see if there are 5 empty lines
> added and removed?
> 
> Cheers,
>   cmn

Hi Charlos.

At least with "git show c21ad764 -- contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilderReducer.java" there are 6 removed lines and 5 added empty lines.

If  `git show --stat` ignores empty lines compared to `git show | diffstat`, is there a way or an option to enable, to tell `git show --stat` to also count empty lines?

Greetings from Berlin
Alex