Re: [PATCH 0/5] "diff --stat" counting fixes

2012-12-01 Thread Junio C Hamano
Antoine Pelisse writes: > I feel like (but I can obviously be wrong): > 1. The info is redundant. When performing a merge, all diffs (without > --staged flag) are unmerged Yes, it is redundant. They are primarily meant as a warning to anybody who runs "git diff --stat" while their index is not

Re: [PATCH 0/5] "diff --stat" counting fixes

2012-12-01 Thread Antoine Pelisse
Hi Junio, That does make a lot of sense and I would have indeed missed a couple of things here. I've been thinking about that "Unmerged" line quite a lot, and I can't get myself any good reason to keep it. Would you mind taking a couple of minutes to make it clear ? I feel like (but I can obviou

[PATCH 0/5] "diff --stat" counting fixes

2012-11-27 Thread Junio C Hamano
It turns out that there are at least two bugs in the diffstat counting code. This series comes on top of the earlier 74faaa1 (Fix "git diff --stat" for interesting - but empty - file changes, 2012-10-17) to fix them. Junio C Hamano (5): test: add failing tests for "diff --stat" to t4049 diff