From: sf <sf@b-i-t•de>
To: git@vger•kernel.org
Subject: Re: [PATCH] Teach --text option to diff
Date: Fri, 07 Jul 2006 13:53:25 +0200 [thread overview]
Message-ID: <44AE4B35.6060607@b-i-t.de> (raw)
In-Reply-To: <7v64i91xow.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano wrote:
> Stephan Feder <sf@b-i-t•de> writes:
>
>> I have to send patches of binary data to a customer but the builtin diff
>> was no help in this case.
>
> Given the previous patch, and also your point #2 below, I would
> have expected you to introduce an option to force files to be
> treated as binary even when they are otherwise misidentified as
> text, but this patch is going the other way.
>
> Interesting.
Not really. I was surprised that the GNU diff option --text is
unsupported in the builtin diff.
>
>> 1. The shorthand -a for --text is not implemented. Is there a conflicting
>> shorthand?
>
> I do not think of one offhand, but it's the responsibility for
> the party to propose such an enhancement to do the study ;-)
Of course. I did not find any conflict but as the builtin diff and its
options are used by quite a lot of git commands I wanted to make sure.
If no objections arise I am going to add the shorthand.
>> 2. For diffstat --text is ignored. It seems pointless because binary
>> patch data is not for human consumption anyway.
>
>> 3. No documentation yet. If the patch is accepted I will add a short
>> description. To Documentation/diff-options.txt?
>
> Most likely that would be the place.
Good.
next prev parent reply other threads:[~2006-07-07 11:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-07 10:33 [PATCH] Teach --text option to diff Stephan Feder
2006-07-07 11:06 ` Junio C Hamano
2006-07-07 11:53 ` sf [this message]
2006-07-07 13:57 ` [PATCH 1/3] Teach diff -a as shorthand for --text Stephan Feder
2006-07-07 13:57 ` [PATCH 2/3] Add -a and --text to common diff options help Stephan Feder
2006-07-07 13:57 ` [PATCH 3/3] diff-options: Explain --text and -a Stephan Feder
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=44AE4B35.6060607@b-i-t.de \
--to=sf@b-i-t$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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