From: Jeff King <peff@peff.net>
To: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
git@vger.kernel.org
Subject: Re: Commit/merge messages for binary files
Date: Sat, 19 Feb 2011 03:03:07 -0500 [thread overview]
Message-ID: <20110219080307.GA18039@sigill.intra.peff.net> (raw)
In-Reply-To: <20110219070601.GA14059@sigill.intra.peff.net>
On Sat, Feb 19, 2011 at 02:06:01AM -0500, Jeff King wrote:
> Now that seems wrong. What about doing another diff:
>
> $ git show --oneline --stat --summary
> 43961bc two
> foo.rand | Bin 4096 -> 4096 bytes
> 1 files changed, 0 insertions(+), 0 deletions(-)
>
> That's right. Now let's turn on break detection:
>
> $ git show --oneline --stat --summary -B
> 43961bc two
> foo.rand | 34 +++++++++++++++-------------------
> 1 files changed, 15 insertions(+), 19 deletions(-)
> rewrite foo.rand (100%)
>
> Broken again. So I guess we have some problem with making sure we treat
> broken filepairs as binary.
Yep, builtin_diffstat just didn't handle that case. Two patch series to
follow:
[1/2]: diff: handle diffstat of rewritten binary files
[2/2]: diff: don't retrieve binary blobs for diffstat
The first one fixes the bug, and the second is a convenient optimization
I noticed while there.
-Peff
next prev parent reply other threads:[~2011-02-19 8:03 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 [this message]
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
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=20110219080307.GA18039@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).