From: Jeff King <peff@peff.net>
To: "brian m. carlson" <sandals@crustytoothpaste.net>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)
Date: Tue, 1 Dec 2015 18:10:44 -0500 [thread overview]
Message-ID: <20151201231044.GA13245@sigill.intra.peff.net> (raw)
In-Reply-To: <20151128170932.GC15706@vauxhall.crustytoothpaste.net>
On Sat, Nov 28, 2015 at 05:09:32PM +0000, brian m. carlson wrote:
> > 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
prev parent reply other threads:[~2015-12-01 23:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-25 1:07 What's cooking in git.git (Nov 2015, #04; Tue, 24) Jeff King
2015-11-25 10:13 ` John Keeping
2015-11-25 10:15 ` Jeff King
2015-11-28 15:40 ` brian m. carlson
2015-11-28 16:35 ` Jeff King
2015-11-28 17:09 ` brian m. carlson
2015-12-01 23:10 ` Jeff King [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151201231044.GA13245@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).