From: Alex Riesen <raa.lkml@gmail.com>
Date: Tue, 27 Jun 2006 14:09:52 GMT
Subject: Re: CFT: merge-recursive in C
Message-ID: <81b0412b0606270709q7f5c9958w634041f7a5e0349f@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.63.0606271441320.29667@wbgn013.biozentrum.uni-wuerzburg.de>

On 6/27/06, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > >
> > > I finally got pis^Witched enough by my platform at work and decided
> > > to start the effort of converting Fredriks git-merge-recursive to C.
> > > At the moment it is the only one annoyingly slow thing there.
> >
> > Just tested it on my project. It's still the slow thing (even a bit
> > slower, looks CPU bound).
>
> Should improve when using git-merge-tree, and a faster path_list.
>

For the moment the most visible next offenders are calls to update-index.
I think about batching them (add, add, add, flush, rm, rm, flush,
stages, flush),
but maybe someone have a better idea?