Re: What's cooking in git.git (Jul 2017, #03; Mon, 10)

From: Jeff King <peff@peff.net>
Date: Jul 11, 2017, 09:11 UTC
Message-ID: <20170711091108.3qj35d4yk5el5xxa@sigill.intra.peff.net>
In-Reply-To: <99EB15B6-CAA1-4C78-88B6-C934C8FBD8F8@gmail.com>

On Tue, Jul 11, 2017 at 10:28:08AM +0200, Lars Schneider wrote:

Show 20 quoted lines

> > On 11 Jul 2017, at 00:48, Junio C Hamano <gitster@pobox.com> wrote:
> > 
> > * ls/filter-process-delayed (2017-06-30) 7 commits
> >  (merged to 'next' on 2017-07-05 at a35e644082)
> > + convert: add "status=delayed" to filter process protocol
> > + convert: refactor capabilities negotiation
> > + convert: move multiple file filter error handling to separate function
> > + convert: put the flags field before the flag itself for consistent style
> > + t0021: write "OUT <size>" only on success
> > + t0021: make debug log file name configurable
> > + t0021: keep filter log files on comparison
> > 
> > The filter-process interface learned to allow a process with long
> > latency give a "delayed" response.
> > 
> > Will merge to 'master'.
> 
> Hi Junio,
> 
> can you already tell if this topic has still a chance to be part of 2.14?

I'm not Junio, but we should be able to reason it out. :)

It's marked as "will merge to master", which typically means it will happen during the next integration cycle (i.e., within a few days when the next "What's cooking" is written).

Since 2.14 will be cut from the tip of master in a few weeks, once it's merged it will definitely be in 2.14 (barring a revert, of course).

This holds true during release freeze, too. Anything that makes it to master is part of the release. The stopping point there is that things stop getting marked as "will merge to master".

-Peff