From: Junio C Hamano Date: Fri, 22 Jan 2010 03:50:21 GMT Subject: Re: Remove diff machinery dependency from read-cache Message-ID: <7vzl46bxxe.fsf@alter.siamese.dyndns.org> In-Reply-To: Johannes Schindelin writes: >> In the meantime, I think applying this patch is the right thing to do. >> >> -- >8 -- >> Subject: merge-recursive: do not return NULL only to cause segfault >> >> would help us? > > Sorry, I cannot have a look at this now. That's fine; I know you've been busy outside git (you've kept saying that for past several months), and I didn't really expect you to be single handedly fixing or rewriting merge-recursive. "In the meantime" patch is not about attempting to "fix" anything deep inside the guts of it; it is merely to die() with messages in a function that returned NULL when the caller never expected to see NULL and caused segfault. > But in the long run, I think that it gets tiring to chase all kinds of > weird interactions between unpack_trees(), the rename detection and the > recursive merge. I don't think there is any interaction; as Tim Olsen reported, "resolve" that uses the same unpack_trees() merges the trees just fine. The bug seems to be all inside merge_recursive().