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

Re: Use a *real* built-in diff generator

From
RBRalf Baechle <ralf@linux-mips.org>
Date
Mar 26, 2006, 11:09 UTC
Message-ID
<20060326110934.GA3774@linux-mips.org>
In-Reply-To
<Pine.LNX.4.64.0603251030340.15714@g5.osdl.org>
On Sat, Mar 25, 2006 at 10:39:03AM -0800, Linus Torvalds wrote:
Show 6 quoted lines
> Besides, I hate how GNU patch bends over backwards in applying crap that 
> isn't a proper patch at all (whitespace-corruption, you name it: GNU patch 
> will accept it). Also, I made "git-apply" be all-or-nothing: either it 
> applies the _whole_ patch (across many different files) or it applies none 
> of it. With GNU patch, if you get an error on the fifth file, the four 
> first files have been modified already - aarrgghhh..

Which is apply's greatest strength - and weakness. GNU diff doesn't understand the file renamings bits of git diffs, so they they need to be used with apply. So if a patch doesn't apply? Apply doesn't even have an option to apply things as good as it can and leave the rest in reject files. Yuck.

  Ralf
Previous: Davide LibenziNext: Petr Baudis
Message 15 of 22 in “Use a *real* built-in diff generator”
  1. Linus TorvaldsMar 25, 2006
  2. Junio C HamanoMar 25, 2006
  3. Junio C HamanoMar 25, 2006
  4. Linus TorvaldsMar 25, 2006
  5. Davide LibenziMar 25, 2006
  6. Marco CostalbaMar 25, 2006
  7. Alex RiesenMar 25, 2006
  8. Linus TorvaldsMar 25, 2006
  9. Morten WelinderMar 25, 2006
  10. Linus TorvaldsMar 25, 2006
  11. Linus TorvaldsMar 25, 2006
  12. Davide LibenziMar 25, 2006
  13. Linus TorvaldsMar 25, 2006
  14. Davide LibenziMar 26, 2006
  15. Ralf BaechleMar 26, 2006
  16. Petr BaudisMar 26, 2006
  17. Linus TorvaldsMar 25, 2006
  18. Davide LibenziMar 26, 2006
  19. Junio C HamanoMar 25, 2006
  20. Junio C HamanoMar 25, 2006
  21. Linus TorvaldsMar 25, 2006
  22. Linus TorvaldsMar 25, 2006

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.