Re: [PATCH v4 5/5] unpack-trees: reuse (still valid) cache-tree from src_index

2018-08-13 Thread Ben Peart
On 8/13/2018 12:25 PM, Duy Nguyen wrote: On Mon, Aug 13, 2018 at 6:05 PM Ben Peart wrote: I was part way through writing a patch that would copy the valid parts of the cache-tree from the source index to the dest index Yeah sorry about that. I make bad judgements all the time,

Re: [PATCH v4 5/5] unpack-trees: reuse (still valid) cache-tree from src_index

2018-08-13 Thread Duy Nguyen
On Mon, Aug 13, 2018 at 6:05 PM Ben Peart wrote: > I was part way through writing a patch that would copy the valid parts > of the cache-tree from the source index to the dest index Yeah sorry about that. I make bad judgements all the time, unfortunately. If it's sort of working though, please

Re: [PATCH v4 5/5] unpack-trees: reuse (still valid) cache-tree from src_index

2018-08-13 Thread Ben Peart
On 8/13/2018 11:48 AM, Elijah Newren wrote: On Sun, Aug 12, 2018 at 1:16 AM Nguyễn Thái Ngọc Duy wrote: We do n-way merge by walking the source index and n trees at the same time and add merge results to a new temporary index called o->result. The merge result for any given path could be

Re: [PATCH v4 5/5] unpack-trees: reuse (still valid) cache-tree from src_index

2018-08-13 Thread Duy Nguyen
On Mon, Aug 13, 2018 at 5:48 PM Elijah Newren wrote: > > On Sun, Aug 12, 2018 at 1:16 AM Nguyễn Thái Ngọc Duy > wrote: > > > > We do n-way merge by walking the source index and n trees at the same > > time and add merge results to a new temporary index called o->result. > > The merge result for

Re: [PATCH v4 5/5] unpack-trees: reuse (still valid) cache-tree from src_index

2018-08-13 Thread Elijah Newren
On Sun, Aug 12, 2018 at 1:16 AM Nguyễn Thái Ngọc Duy wrote: > > We do n-way merge by walking the source index and n trees at the same > time and add merge results to a new temporary index called o->result. > The merge result for any given path could be either > > - keep_entry(): same old index

[PATCH v4 5/5] unpack-trees: reuse (still valid) cache-tree from src_index

2018-08-12 Thread Nguyễn Thái Ngọc Duy
We do n-way merge by walking the source index and n trees at the same time and add merge results to a new temporary index called o->result. The merge result for any given path could be either - keep_entry(): same old index entry in o->src_index is reused - merged_entry(): either a new entry is