From: Miklos Vajna <vmiklos@frugalware.org>
Date: Sat, 23 Aug 2008 06:08:39 GMT
Subject: Re: [bug] git `next' does not do trivial merges
Message-ID: <20080823060839.GB23800@genesis.frugalware.org>
In-Reply-To: <20080822193117.GA6361@coredump.intra.peff.net>

On Fri, Aug 22, 2008 at 03:31:17PM -0400, Jeff King <peff@peff.net> wrote:
> On Fri, Aug 22, 2008 at 08:36:39AM +0200, Paolo Bonzini wrote:
> 
> > I had already posted this bug report yesterday but it was hidden in a  
> > cover letter at  
> > http://permalink.gmane.org/gmane.comp.version-control.git/93143 -- so  
> > I'll copy the relevant info here:
> 
> Sadly, this bisects to 1c7b76b (Build in merge).

I guessed the bug is in builtin-merge.c::read_tree_trivial(), but I
don't see how it is different to builtin-read-tree.c::cmd_read_tree(),
at least the unpack_trees_options struct is the same.

I'm on it..