From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Jan 2010 17:52:48 GMT
Subject: Re: What's cooking in git.git (Jan 2010, #06; Wed, 20)
Message-ID: <7vzl47s5u7.fsf@alter.siamese.dyndns.org>
In-Reply-To: <201001211018.10085.johan@herland.net>

Johan Herland <johan@herland.net> writes:

> In any case, I totally understand if you'd rather want to hold the entire 
> notes series in 'pu', and instead focus on fixing the bugs in what's already 
> been released.

That is a different issue than what to do with the first three that people
have been using from 'next'.  As I want to close the -rc0 by the end of
this week, I've merged these early ones to 'master'.

Tentatively I had to drop the remainder of 'jh/notes' from 'pu', but that
is not because I didn't like what was in the series.  From the discussion
of last night, a patch to squelch "Notes: " output in "format-patch" was
queued and it is meant for 1.6.6.X series, but the precondition a new test
in that fix relies on in t3301 (i.e. fourth commit having a certain notes)
is changed in jh/notes series and merging it makes the tests break. I
haven't gotten around looking into its details, but the fix patch needs to
be in 'master' soon, and the first patches from 'jh/notes' are already in
'master', so probably we would want to rebase the remainder on top of
updated 'master' when 1.7.0-rc0 is tagged.