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

Re: [PATCH] Don't update unchanged merge entries

From
Linus Torvalds <torvalds@linux-foundation.org>
Date
Mar 16, 2008, 21:15 UTC
Message-ID
<alpine.LFD.1.00.0803161413250.3020@woody.linux-foundation.org>
In-Reply-To
<alpine.LNX.1.00.0803161700430.19665@iabervon.org>
On Sun, 16 Mar 2008, Daniel Barkalow wrote:
Show 5 quoted lines
> 
> Well, the top part of the comment suggests that this is just an 
> optimization (don't bother to write out a file that you know is 
> unchanged), when it's actually necessary for correctness (since we don't 
> know if the working tree matches the old index).

Ahh, that part. Yeah, maybe we could expand/clarify it. I don't think the comment is wrong per se, but yes, I'm sure it could be improved. 

		Linus
Previous: Daniel BarkalowNext: Junio C Hamano
Message 10 of 11 in “"git pull" throws away dirty state”
  1. Linus TorvaldsMar 16, 2008
  2. Linus TorvaldsMar 16, 2008
  3. Nicolas PitreMar 16, 2008
  4. Junio C HamanoMar 16, 2008
  5. Junio C HamanoMar 16, 2008
  6. Don't update unchanged merge entriesLinus Torvalds, Mar 16, 2008
  7. Daniel BarkalowMar 16, 2008
  8. Linus TorvaldsMar 16, 2008
  9. Daniel BarkalowMar 16, 2008
  10. Linus TorvaldsMar 16, 2008
  11. Junio C HamanoMar 16, 2008

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.