From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
git@vger.kernel.org
Subject: Re: [PATCH 2/2] diff: don't retrieve binary blobs for diffstat
Date: Tue, 22 Feb 2011 10:37:29 -0500 [thread overview]
Message-ID: <20110222153729.GA27178@sigill.intra.peff.net> (raw)
In-Reply-To: <7v62sdhsjy.fsf@alter.siamese.dyndns.org>
On Mon, Feb 21, 2011 at 03:33:05PM -0800, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > We only need the size, which is much cheaper to get,
> > especially if it is a big binary file.
> >
> > Signed-off-by: Jeff King <peff@peff.net>
> > ---
>
> Nice ;-) Do we want a test or two for 1/2 by the way?
Yeah, it's probably a good idea. Can you squash this in, or should I
resend?
---
diff --git a/t/t4031-diff-rewrite-binary.sh b/t/t4031-diff-rewrite-binary.sh
index 7e7b307..7d7470f 100755
--- a/t/t4031-diff-rewrite-binary.sh
+++ b/t/t4031-diff-rewrite-binary.sh
@@ -44,6 +44,13 @@ test_expect_success 'rewrite diff can show binary patch' '
grep "GIT binary patch" diff
'
+test_expect_success 'rewrite diff --stat shows binary changes' '
+ git diff -B --stat --summary >diff &&
+ grep "Bin" diff &&
+ grep "0 insertions.*0 deletions" diff &&
+ grep " rewrite file" diff
+'
+
{
echo "#!$SHELL_PATH"
cat <<'EOF'
next prev parent reply other threads:[~2011-02-22 15:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-17 20:40 Commit/merge messages for binary files Piotr Krukowiecki
2011-02-18 13:53 ` Matthieu Moy
2011-02-18 20:30 ` Piotr Krukowiecki
2011-02-18 21:19 ` Matthieu Moy
2011-02-18 21:42 ` Piotr Krukowiecki
2011-02-19 7:06 ` Jeff King
2011-02-19 8:03 ` Jeff King
2011-02-19 8:04 ` [PATCH 1/2] diff: handle diffstat of rewritten " Jeff King
2011-02-19 8:16 ` [PATCH 2/2] diff: don't retrieve binary blobs for diffstat Jeff King
2011-02-21 23:33 ` Junio C Hamano
2011-02-22 15:37 ` Jeff King [this message]
2011-02-22 19:00 ` Junio C Hamano
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=20110222153729.GA27178@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=piotr.krukowiecki@gmail.com \
/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).