Re: [PATCH] diff-options: add --patch-with-stat

From: Marco Costalba <mcostalba@gmail.com>
Date: Apr 15, 2006, 13:01 UTC
Message-ID: <e5bfff550604150601n335205actb0e1955884e76582@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.63.0604151436280.6147@wbgn013.biozentrum.uni-wuerzburg.de>

On 4/15/06, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Show 9 quoted lines

> Hi,
>
> On Sat, 15 Apr 2006, Junio C Hamano wrote:
>
> > Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> >
> > >     BTW I really would like to have a diffstat for combined diffs.
> > >     Any ideas?
> >

 Just another idea, from current git:

$ git-diff-tree -r -m --stat 4da8cbc23
4da8cbc234177d6a8cf749d4ef60bd05ec843898
---
 blame.c     |   20 ++++++++++++++------
 diff-tree.c |    2 +-
 diff.h      |    6 +++++-
 git.c       |   15 +++++++++++++--
 http-push.c |    1 +
 rev-list.c  |    1 +
 revision.c  |   26 ++++++++++++--------------
 revision.h  |    7 +++++--
 tree-diff.c |   46 +++++++++++++++++++++++++---------------------
 9 files changed, 77 insertions(+), 47 deletions(-)
4da8cbc234177d6a8cf749d4ef60bd05ec843898
---
 Documentation/diff-options.txt |    3 +
 Documentation/git-apply.txt    |    8 ++-
 Makefile                       |   14 ++++-
 apply.c                        |  123 ++++++++++++++++++++++++++++++++++------
 combine-diff.c                 |   12 ++++
 diff.c                         |   83 ++++++++++++++++-----------
 diff.h                         |    3 +
 http-fetch.c                   |    8 +--
 http-push.c                    |    6 +-
 9 files changed, 199 insertions(+), 61 deletions(-)

$ git-diff-tree -r -c 4da8cbc23 4da8cbc234177d6a8cf749d4ef60bd05ec843898 ::100644 100644 100644 c5372b984a457d0e5bddcf0b334a1a3cdc149cec cc7cc627c88d135c3f8d814449813e73c1ea3430 236095fc9a1a6ffc056be8616c0f83e4e8c7ec2f MM diff.h ::100644 100644 100644 994ee90035c4ae5e055df79cea8621d294190a3f aa0bc1f6f6a51fb39d54dc81b93805f86d19aa46 19a0f772e7bf729755c66ab38f5dfb64ae784f00 MM http-push.c

PROPOSED OUTPUT:

$ git-diff-tree -r -c --stat 4da8cbc23

4da8cbc234177d6a8cf749d4ef60bd05ec843898
---
 diff.h      |    6 +++++-
 http-push.c |    1 +
 2 files changed, 6 insertions(+), 1 deletions(-)
4da8cbc234177d6a8cf749d4ef60bd05ec843898
---
 diff.h      |    3 +++
 http-push.c |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

I agree Junio ouput is nicer, this one is perhaps more consistent with git-diff-tree -m --stat output.

Marco