From: "Marco Costalba" <mcostalba@gmail.com>
To: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Cc: "Junio C Hamano" <junkio@cox.net>, git@vger.kernel.org
Subject: Re: [PATCH] diff-options: add --patch-with-stat
Date: Sat, 15 Apr 2006 15:01:43 +0200 [thread overview]
Message-ID: <e5bfff550604150601n335205actb0e1955884e76582@mail.gmail.com> (raw)
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:
> 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
prev parent reply other threads:[~2006-04-15 13:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-15 11:41 [PATCH] diff-options: add --patch-with-stat Johannes Schindelin
2006-04-15 11:50 ` Marco Costalba
2006-04-15 11:56 ` Johannes Schindelin
2006-04-15 12:33 ` Junio C Hamano
2006-04-15 12:37 ` Johannes Schindelin
2006-04-15 13:01 ` Marco Costalba [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e5bfff550604150601n335205actb0e1955884e76582@mail.gmail.com \
--to=mcostalba@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).