From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/2] diff: respect textconv in rewrite diffs
Date: Wed, 10 Dec 2008 00:34:26 -0800 [thread overview]
Message-ID: <7v3agw2zu5.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: 20081209081321.GA19707@coredump.intra.peff.net
Jeff King <peff@peff.net> writes:
> Currently we just skip rewrite diffs for binary files; this patch makes
> an exception for files which will be textconv'd, and actually performs
> the textconv before generating the diff.
>
> Conceptually, rewrite diffs should be in the exact same format as the a
> non-rewrite diff, except that we refuse to share any context. Thus it
> makes very little sense for "git diff" to show a textconv'd diff, but
> for "git diff -B" to show "Binary files differ".
Makes sense.
> +cat >dump <<'EOF'
> +#!/bin/sh
> +perl -e '$/ = undef; $_ = <>; s/./ord($&)/ge; print $_' < "$1"
> +EOF
I'll squash in a change to make this part use $SHELL_PATH for
consistency. Thanks.
next prev parent reply other threads:[~2008-12-10 8:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-09 8:12 [PATCH 1/2] diff: fix handling of binary rewrite diffs Jeff King
2008-12-09 8:13 ` [PATCH 2/2] diff: respect textconv in " Jeff King
2008-12-10 8:34 ` Junio C Hamano [this message]
2008-12-10 9:02 ` Jeff King
2008-12-10 20:27 ` Junio C Hamano
2008-12-10 8:34 ` [PATCH 1/2] diff: fix handling of binary " Junio C Hamano
2008-12-10 9:04 ` Jeff King
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=7v3agw2zu5.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.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).