Re: CFT: merge-recursive in C (updated)

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jun 29, 2006, 13:16 UTC
Message-ID: <Pine.LNX.4.63.0606291440510.29667@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <20060627223249.GA8177@steel.home>

Hi,

On Wed, 28 Jun 2006, Alex Riesen wrote:

Show 9 quoted lines

> > > Path list optimization should be next (and I'll be glad if someone does 
> > > this before me).
> > 
> > See below.
> > 
> 
> Aah, thanks. Merged, tried, tested, left in patch.
> The reallocs can cause some undesirable heap fragmentation, don't you
> think?

I do not care too deeply about the heap fragmentation there: it is just 4 bytes per file name. Besides, I chose an increment of 32 (probably I should use alloc_nr() instead).

Show 7 quoted lines

> I tried to replace that code completely with a call to git-merge-base
> (it does not happen too often). So far it passed all tests.
> 
> > I have some commits in a private branch to split out get_merge_bases() 
> > from merge-base.c, so I'll try that next.
> 
> Thanks, that'd be nice.

Will reply with two patches.

Show 5 quoted lines

> > BTW, before actually finishing this, we might want to do away with 
> > capitalizedFunctionNames and 4-space indent.
> 
> 4-space indent should be gone by now, the names pending (they were
> important in initial debugging after conversion).

Okay.

Ciao, Dscho