git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 3/3] git-merge-file: refuse to merge binary files

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jun 5, 2007, 05:11 UTC
Message-ID
<Pine.LNX.4.64.0706050607490.4046@racer.site>
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

Previous: Linus TorvaldsNext: Junio C Hamano
Message 3 of 5 in “git-merge-file: refuse to merge binary files”
  1. 3/3 git-merge-file: refuse to merge binary filesJohannes Schindelin, Jun 5, 2007
  2. Linus TorvaldsJun 5, 2007
  3. Johannes SchindelinJun 5, 2007
  4. Junio C HamanoJun 5, 2007
  5. Junio C HamanoJun 5, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.