Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 3, 2015, 01:09 UTC
Message-ID: <xmqqtwo0tk24.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20151202223114.GA20542@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 21 quoted lines

> On Wed, Dec 02, 2015 at 02:11:32PM -0800, Junio C Hamano wrote:
>
>> I think I managed to get my working area (together with a handful of
>> new entries in the rerere database and a few merge-fix/ entries) in
>> sync with what you pushed out well enough that my automated
>> procedure would recreate the status of various branches you pushed
>> out exactly.
>> 
>> I haven't caught up with the changes in the component branches,
>> though, so it may take a few days until I start picking up new
>> topics from the list traffic.
>
> My whole workspace is at https://github.com/peff/git, if fetching that
> directly is easier. I just noticed that my refspecs were not configured
> to push up refs/merge-fix. I've just fixed that and pushed again.
>
> I'll leave it that way for a few more days, but then will probably take
> it back to my usual contributor setup (i.e., just my topics and personal
> integration branches).
>
> Let me know if there's anything else I can do to help with the handoff.

I've rebuilt 'pu' (and 'jch') with the component topics myself, following the exact order of merges you had between master..pu, in order to make sure that I fully made my working area in sync with your merge resolutions, meaning that there shouldn't be any differences between trees of the tips of integration branches.

The result has been pushed out to various places. The push to https://github.com/git/git/ resulted in a single 'pu' update (the trees did not change, the merge history was rebuilt as stated in the previous paragraph). Other repositories, i.e.

  git://git.kernel.org/pub/scm/git/git.git/
  git://repo.or.cz/alt-git.git/
  git://git.sourceforge.jp/gitroot/git-core/git.git/
  git://git-core.git.sourceforge.net/gitroot/git-core/git-core/

received various updates to match your last integration results.

So it is OK for you to set your workspace back to your usual contributor settings. I can continue from here on.

Note that I haven't made any new merges, picked up any new topics or replaced an old patch on an existing topic with a new one (yet). Hopefully I can get to that tomorrow.

Thanks.