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

Re: [PATCH 2/2] Fix oversimplified optimization for add_cache_entry().

From
Linus Torvalds <torvalds@osdl.org>
Date
Jun 25, 2005, 00:57 UTC
Message-ID
<Pine.LNX.4.58.0506241755280.11175@ppc970.osdl.org>
In-Reply-To
<7vvf439vdl.fsf@assigned-by-dhcp.cox.net>
On Fri, 24 Jun 2005, Junio C Hamano wrote:
> 
> Resurrect the unoptimized directory-file conflict check code for
> now as well.  The new one did not handle higher stages properly.
I really don't want to do this.

Can you fix the "optimized" one instead? Currently the only "optimization" is really to just not call it for any non-stage0 thing, the real advantage is that the old code was totally unreadable and did everything in one big thing.

I'm ok with dropping the optimization, but I don't want to lose the cleanup of splitting that horrible old function into two.

		Linus
Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 19 in “D/F conflicts fixes.”
  1. 0/2 D/F conflicts fixes.Junio C Hamano, Jun 23, 2005
  2. 1/2 Add more tests for read-tree --emu23.Junio C Hamano, Jun 23, 2005
  3. 2/2 Fix oversimplified optimization for add_cache_entry().Junio C Hamano, Jun 24, 2005
  4. Linus TorvaldsJun 25, 2005
  5. Junio C HamanoJun 25, 2005
  6. 0/9 Fix oversimplified optimization for add_cache_entry().Junio C Hamano, Jun 25, 2005
  7. 1/9 fix date parsing for GIT raw commit timestamp format.Junio C Hamano, Jun 25, 2005
  8. 2/9 git-commit-script: get commit message from an existing one.Junio C Hamano, Jun 25, 2005
  9. 3/9 git-cherry: find commits not merged upstream.Junio C Hamano, Jun 25, 2005
  10. 4/9 git-rebase-script: rebase local commits to new upstream head.Junio C Hamano, Jun 25, 2005
  11. 5/9 Add more tests for read-tree --emu23.Junio C Hamano, Jun 25, 2005
  12. 6/9 git-merge-one-file-script: do not misinterpret rm failure.Junio C Hamano, Jun 25, 2005
  13. 7/9 Fix oversimplified optimization for add_cache_entry().Junio C Hamano, Jun 25, 2005
  14. 8/9 http-pull: documentation updates.Junio C Hamano, Jun 25, 2005
  15. 9/9 Add a bit of developer documentation to pull.hJunio C Hamano, Jun 25, 2005
  16. [RFD] consider "git" wrapper semi-PorcelainJunio C Hamano, Jun 26, 2005
  17. Linus TorvaldsJun 26, 2005
  18. Junio C HamanoJun 26, 2005
  19. Martijn KuipersJun 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.