Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> writes: > On Thu, 13 Mar 2008, Linus Torvalds wrote: >> >> Ok, I can reproduce this, I'm on it like a maggot on a two-week-dead baby >> donkey. > > Ok, that was embarrassing. > > This should fix it. Spot the stupid stack corruption.. > > Linus > diff --git a/unpack-trees.c b/unpack-trees.c > index be89d52..b62b054 100644 > --- a/unpack-trees.c > +++ b/unpack-trees.c > @@ -8,6 +8,8 @@ > #include "progress.h" > #include "refs.h" > > +#define MAX_UNPACK_TREES 4 Somehow this reminds me of a9ab200 (Clean-up read-tree error condition., Aug 16, 2007) and f34f2b0 (Fix read-tree merging more than 3 trees using 3-way merge, Aug 15, 2007). -- 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