From: Junio C Hamano <gitster@pobox.com>
To: Jason Xu <jasonx98@gmail.com>
Cc: "brian m. carlson" <sandals@crustytoothpaste.net>, git@vger.kernel.org
Subject: Re: Force git diff to create a binary patch?
Date: Tue, 14 Jul 2020 08:35:54 -0700 [thread overview]
Message-ID: <xmqqv9iqkt2d.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <CAGPh-qPH+gGYHCy+rQJvzwr-Vp71UJxwr+w-G9GaV_o40K8P-Q@mail.gmail.com> (Jason Xu's message of "Tue, 14 Jul 2020 00:56:07 -0400")
Jason Xu <jasonx98@gmail.com> writes:
>> The "--binary" option was invented as a way to tell Git to
>> produce something that can be applied, where Git stopped at
>> saying "binary files differ".
>
> Doesn't `--text` already do that? Albeit with whitespace warnings.
I do not think so. --text is about forcing everything to be treated
text, so you'll not see binary patches but the patch-looking thing
with binary garbage you wrote in the message that started this
thread. IOW, that is the opposite of what you want. And I agree
that such a "diff -a" output is prone to corruption during transfer
(e.g. over e-mail) and a way to tell exactly which paths should be
shown as binary patches is a good thing to have.
> That's why I propose better binary file detection, instead of (what I
> understand to be) "make all patches in a patch file GIT binary
> patches, regardless if a file is text".
Oh, I agree that "treat everything as binary and produce binary
patch for all paths" is a nonsense option no sane person would want
to use. The users are better off exchanging bundles at that point,
as such a binary-only patches are unreadable anyway.
There is no "better detection"; the only thing you could get is
"better heuristics" and there will always be a limit to what
heuristics can do for you.
And that is why you were given gitattributes very early in the
discussion ;-) That is the mechanism to tell exactly which paths
should be treated as binary.
prev parent reply other threads:[~2020-07-14 15:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-13 4:58 Force git diff to create a binary patch? Jason Xu
2020-07-13 14:51 ` Junio C Hamano
[not found] ` <20200713223906.GH8360@camp.crustytoothpaste.net>
2020-07-14 4:09 ` Jason Xu
2020-07-14 4:34 ` Junio C Hamano
2020-07-14 4:34 ` Junio C Hamano
2020-07-14 4:56 ` Jason Xu
2020-07-14 15:35 ` Junio C Hamano [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=xmqqv9iqkt2d.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jasonx98@gmail.com \
--cc=sandals@crustytoothpaste.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).