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

Re: git applymbox is too anal

From
Linus Torvalds <torvalds@osdl.org>
Date
Sep 9, 2005, 00:58 UTC
Message-ID
<Pine.LNX.4.58.0509081754150.3051@g5.osdl.org>
In-Reply-To
<20050908232535.GA7700@kroah.com>
On Thu, 8 Sep 2005, Greg KH wrote:
> 
> Or am I missing some option to 'git applymbox' that I can't seem to
> find?

No. git-apply wants an exact bit-for-bit match. Partly because fuzz is hard, but mostly because I don't like it. I apply a _lot_ of patches, and if a unforgiving "git-apply" works for me, it should work for you too.

One issue is that I want to apply patches that apply cleanly, and if the patch was generated against some older kernel version, then it should quite likely be _applied_ towards that older kernel version. Then you can use git to merge the two.

Of course, I only do that occasionally, for bigger clashes. For smaller things, I just edit the patch by hand. And sometimes, I ask the sending side to re-generate the patch.

Applying with a fuzz does the right thing most of the time. But "most" isn't good enough. I'd rather have a human look at anything that requires fuzz.

		Linus
Previous: Junio C HamanoNext: Greg KH
Message 4 of 5 in “git applymbox is too anal”
  1. Greg KHSep 8, 2005
  2. Greg KHSep 8, 2005
  3. Junio C HamanoSep 9, 2005
  4. Linus TorvaldsSep 9, 2005
  5. Greg KHSep 9, 2005

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.