Re: [PATCH 5/7] tmp-objdir: new API for creating and removing primary object dirs

2 messages, 2 authors, 2021-10-01 · open the first message on its own page

Re: [PATCH 5/7] tmp-objdir: new API for creating and removing primary object dirs

From: Junio C Hamano <hidden>
Date: 2021-09-30 20:06:47

Jeff King [off-list ref] writes:
  - is it possible for the merge code to ever write an object? I kind of
    wonder if we'd ever do any cache-able transformations as part of a
    content-level merge. I don't think we do now, though.
How is virtual merge base, result of an inner merge that recursively
merging two merge bases, fed to an outer merge as the ancestor?
Isn't it written as a tree object by the inner merge as a tree with
full of blob objects, so the outer merge does not have to treat a
merge base tree that is virtual any specially from a sole merge
base?

Re: [PATCH 5/7] tmp-objdir: new API for creating and removing primary object dirs

From: Elijah Newren <hidden>
Date: 2021-10-01 04:00:01

On Thu, Sep 30, 2021 at 1:06 PM Junio C Hamano [off-list ref] wrote:
Jeff King [off-list ref] writes:
quoted
  - is it possible for the merge code to ever write an object? I kind of
    wonder if we'd ever do any cache-able transformations as part of a
    content-level merge. I don't think we do now, though.
How is virtual merge base, result of an inner merge that recursively
merging two merge bases, fed to an outer merge as the ancestor?
Isn't it written as a tree object by the inner merge as a tree with
full of blob objects, so the outer merge does not have to treat a
merge base tree that is virtual any specially from a sole merge
base?
Yes.  And that's not unique to the inner merges; it also writes new
blob and tree objects for the outer merge, and then passes the
resulting toplevel tree id out as the result.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help