Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)

From: Jeff King <peff@peff.net>
Date: Dec 1, 2015, 23:10 UTC
Message-ID: <20151201231044.GA13245@sigill.intra.peff.net>
In-Reply-To: <20151128170932.GC15706@vauxhall.crustytoothpaste.net>

On Sat, Nov 28, 2015 at 05:09:32PM +0000, brian m. carlson wrote:

Show 12 quoted lines

> > I got a bunch of conflicts trying to merge it into 'next' and 'pu' and
> > punted on it. I think the tricky bits are coming from
> > dt/refs-backend-pre-vtable, where there was a lot of code movement.
> 
> I think as for merging into the latest pu, the thing you want to do in
> refs.c is simply take what pu has.  You'll have to fix up one additional
> struct object call site.  The same thing goes for builtin/merge.c and
> builtin/branch.c, where the code I changed has since been eliminated.
> 
> I also noticed that merge-recursive.c and builtin/ff-refs.c needed some
> minor fixups as well, but a quick compile will show you where those are.
> I've included a diff for those two below.

Thanks, this gave me an opportunity to play with Junio's merge-fix scripts. :) The result will be in the "pu" I push out shortly.

-Peff