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

Re: [RFC] diff-cache buglet

From
Linus Torvalds <torvalds@osdl.org>
Date
Apr 26, 2005, 19:09 UTC
Message-ID
<Pine.LNX.4.58.0504261207380.18901@ppc970.osdl.org>
In-Reply-To
<7vk6mpnz96.fsf@assigned-by-dhcp.cox.net>
On Tue, 26 Apr 2005, Junio C Hamano wrote:
Show 5 quoted lines
> 
> We should just fix "remove-merge-entries" and call that
> unconditionally before the read-tree is called.  Once it is
> fixed, we need to think about how to show this stage
> information but that should be a separate discussion.

I already applied that part of your fix and pushed it out, there as no question about that one.

I just thought that _if_ you wanted the unmerged parts to show up, then the "1//filename.c" thing might be acceptable. Personally, I just think diff-cache is pretty nonsensical with unmerged files,

		Linus
Previous: Junio C HamanoNext: Junio C Hamano
Message 8 of 9 in “[RFC] diff-cache buglet”
  1. Junio C HamanoApr 26, 2005
  2. Linus TorvaldsApr 26, 2005
  3. Junio C HamanoApr 26, 2005
  4. Linus TorvaldsApr 26, 2005
  5. Junio C HamanoApr 26, 2005
  6. Linus TorvaldsApr 26, 2005
  7. Junio C HamanoApr 26, 2005
  8. Linus TorvaldsApr 26, 2005
  9. Junio C HamanoApr 26, 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.