Hi, On Sun, 9 Mar 2008, Daniel Barkalow wrote: > On Mon, 10 Mar 2008, Johannes Schindelin wrote: > > > Yes. And this sets dst_index (what I tried to hint at with my patch). > > Oh, yes. Your patch is what prompted me to fix that part (and to find > that Linus's unpack_trees was in next now). But seeing src_index in your > patch made me wonder what it wanted a source index for anyway, since > this is the first index we've had in this repo. Well, stupid copy-'n-paste. Well, not all that stupid: because of the twoway_merge (and because the segmentation fault was in a line accessing src_index), I assumed that the src_index is needed. But your explanation that oneway_merge is all we want makes tons of sense. Ciao, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
