From: Junio C Hamano Date: Mon, 15 Nov 2010 23:05:07 GMT Subject: Re: [PATCH] use persistent memory for rejected paths Message-ID: <7v62vyjiho.fsf@alter.siamese.dyndns.org> In-Reply-To: <20101115194133.GA3297@localhost> Clemens Buchacher writes: > On Mon, Nov 15, 2010 at 08:03:40PM +0100, Matthieu Moy wrote: >> Clemens Buchacher writes: >> >> > An aborted merge prints the list of rejected paths as part of the >> > error message. Some of those paths do not have static buffers, so >> > we have to keep a copy. >> >> Like Junio, I'm surprised by this, but I guess you encountered the >> problem. > > You don't have to take my word for it, just try the test. It should > be failing nicely. :-) As far as I remember the tests were about the output order and never about "ah we are showing stale contents from stack" (which is rather hard to arrange for reliable testing anyway). >> Did you remove all uses of "struct rejected_paths_list"? If so, you >> can remove its declaration, if not, why? > > Indeed I can. Thanks. I see you have v2 now; will replace. Thanks.