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

Re: In tree object, Must the

From
Shawn Pearce <spearce@spearce.org>
Date
Apr 9, 2012, 21:03 UTC
Message-ID
<CAJo=hJsh6DyUA3gV1Yiho5bwCdi99aMkBHepy-VVnFwJPeWYOg@mail.gmail.com>
In-Reply-To
<7vhawsvffn.fsf@alter.siamese.dyndns.org>
On Mon, Apr 9, 2012 at 13:05, Junio C Hamano <gitster@pobox.com> wrote:
Show 9 quoted lines
> Shawn Pearce <spearce@spearce.org> writes:
>
>> ... And that niggly bit about subtrees sorting as
>> though their names end in '/' even though they don't really matters.
>
> Yeah, in older and buggier unpack-trees it might have made the code
> simpler while walking the index and the tree in parallel, but when we have
> to deal with D/F conflicts, we have to find a entry with matching name
> anyway, so it turned out not to be a win at all.

JGit still waks the trees in parallel. We handle the D/F conflict stuff using a small amount of look-ahead and sometimes rescan back from the start. In practice that works out really well, it catches most forms of D/F conflict with little overhead, and almost no overhead when there is no D/F conflict, which is common.

Previous: Junio C Hamano
Message 7 of 7 in “In tree object, Must the”
  1. Yi, EungJunApr 8, 2012
  2. Carlos Martín NietoApr 8, 2012
  3. Yi, EungJunApr 8, 2012
  4. Junio C HamanoApr 9, 2012
  5. Shawn PearceApr 9, 2012
  6. Junio C HamanoApr 9, 2012
  7. Shawn PearceApr 9, 2012

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.