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
Junio C Hamano <gitster@pobox.com>
Date
Jun 5, 2007, 05:16 UTC
Message-ID
<7vwsyjgeuz.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<alpine.LFD.0.98.0706042059420.23741@woody.linux-foundation.org>
Linus Torvalds <torvalds@linux-foundation.org> writes:
Show 7 quoted lines
> I really think this would be better off using the crlf-like heuristics.
>
> 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"
>
> 		Linus

On the other hand that hardcoded fallback is consistent with diff, which is closely related to xdl_merge(). Attributes can be specified to override this anyway, so...

Previous: Johannes SchindelinNext: Junio C Hamano
Message 4 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.