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

Re: [PATCH] make file merging respect permissions

From
Linus Torvalds <torvalds@osdl.org>
Date
Apr 24, 2005, 01:01 UTC
Message-ID
<Pine.LNX.4.58.0504231759010.2344@ppc970.osdl.org>
In-Reply-To
<1114298490.5264.10.camel@mulgrave>
On Sat, 23 Apr 2005, James Bottomley wrote:
> 
> This is the actual diff
This is _still_ corrupted.

Are you editing your diffs by hand without understanding how the diffs work?

The second chunk of the "git-merge-one-file" diff _still_ claims to change twelve lines, and that diff _still_ only changes eleven lines. My "patch" isn't happy, and I can count the lines in the diff myself and verify that it's not patch that is wrong, it's your diff.

Please please _please_ don't edit diffs by hand if you don't know what you're doing. Generate the diff from a clean source instead. Or ask me to fix it up, I'm so used to editing diffs that I can do it in my sleep.

		Linus
Previous: James BottomleyNext: James Bottomley
Message 8 of 14 in “make file merging respect permissions”
  1. make file merging respect permissionsJames Bottomley, Apr 23, 2005
  2. Linus TorvaldsApr 23, 2005
  3. James BottomleyApr 23, 2005
  4. James BottomleyApr 23, 2005
  5. Petr BaudisApr 23, 2005
  6. James BottomleyApr 23, 2005
  7. James BottomleyApr 23, 2005
  8. Linus TorvaldsApr 24, 2005
  9. James BottomleyApr 24, 2005
  10. Linus TorvaldsApr 24, 2005
  11. James BottomleyApr 24, 2005
  12. [PATH] fix segfault in fsck-cacheAndreas Gal, Apr 24, 2005
  13. Andreas GalApr 24, 2005
  14. James BottomleyApr 24, 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.