From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: git@vger.kernel.org, junkio@cox.net
Subject: Re: [PATCH 3/3] git-merge-file: refuse to merge binary files
Date: Tue, 5 Jun 2007 06:11:33 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0706050607490.4046@racer.site> (raw)
In-Reply-To: <alpine.LFD.0.98.0706042059420.23741@woody.linux-foundation.org>
Hi,
On Mon, 4 Jun 2007, Linus Torvalds wrote:
> I really think this would be better off using the crlf-like heuristics.
I don't know. Given that it took quite a while to actually hit this bug...
> It's entirely possible that the "NUL character in the first X bytes"
> heuristic is wrong for some cases, so I find it a bit nasty to
> hardcoding it as the only rule for "it must be binary"
Yes, you're right.
However, if you call git-merge-file, you have to be aware of what it does.
It is a _standalone_ program, meant to make it easier to write scripts.
Maybe it is not worth detecting binary files _at all_ in merge-file.
Ciao,
Dscho
next prev parent reply other threads:[~2007-06-05 5:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-05 2:37 [PATCH 3/3] git-merge-file: refuse to merge binary files Johannes Schindelin
2007-06-05 4:00 ` Linus Torvalds
2007-06-05 5:11 ` Johannes Schindelin [this message]
2007-06-05 5:16 ` Junio C Hamano
2007-06-05 5:16 ` 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=Pine.LNX.4.64.0706050607490.4046@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=torvalds@linux-foundation.org \
/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).