Re: [PATCH] Fix read-tree merging more than 3 trees using 3-way merge

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Aug 17, 2007, 02:32 UTC
Message-ID: <alpine.LFD.0.999.0708161930100.30176@woody.linux-foundation.org>
In-Reply-To: <7vbqd6j4a0.fsf@gitster.siamese.dyndns.org>

On Thu, 16 Aug 2007, Junio C Hamano wrote:

Show 8 quoted lines

>
> Linus Torvalds <torvalds@linux-foundation.org> writes:
> > 
> > Sorry. I didn't even realize people did this. Oops.
> 
> This is no big deal.  It would have triggered if you are using
> resolve strategy _and_ did a multi merge-base merge, the former
> of which is quite unusual these days.

Yeah, ok. I see what's up.

Anyway, it sounds like we should just increase MAX_TREES to get the old behaviour (and that requires applying my trivial one-liner patch too, otherwise "git read-tree" will refuse to do more than 4 trees anyway).

Even if nothing apparently actually does it.

The alternative, I think, would be to just say that the three-way merge is really just three ways, and remove the test that tests four different trees. That would allow simplifying the logic in unpack_trees(). But since the logic already exists, there's no real upside.

		Linus