Re: What's cooking in git.git (May 2012, #02; Fri, 4)

From: Junio C Hamano <gitster@pobox.com>
Date: May 10, 2012, 14:50 UTC
Message-ID: <7vd36cozsi.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20120510131255.GA2950@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 16 quoted lines

> On Fri, May 04, 2012 at 04:06:18PM -0700, Junio C Hamano wrote:
>
>> --------------------------------------------------
>> [Graduated to "master"]
>> 
>> * jk/maint-push-progress (2012-05-01) 3 commits
>>   (merged to 'next' on 2012-05-01 at 2286130)
>>  + t5541: test more combinations of --progress
>>  + teach send-pack about --[no-]progress
>>  + send-pack: show progress when isatty(2)
>> 
>> "git push" over smart-http lost progress output and this resurrects it.
>> 
>> Will merge to 'master'.
>
> I noticed that this graduated to master, but not to maint. Any reason?

Nobody goes direct to 'maint' if it is complex enough to go through next/pu cycle these days.

  $ git log -p Documentation/RelNotes/1.7.11.txt

will show, for example, jk/maint-config-bogus-section was merged as part of the eighth batch (May 2) to 'master', but merged to 'maint' only after we had it in 'master' for a bit without hearing any breakage caused by it.

Just like all the other features listed below the "Fixes since v1.7.10" fold, the 'push progress' went into 'master' very recently with a note to merge it later to 'maint', and we haven't seen 'later' yet.