Re: What's cooking in git.git (Oct 2017, #01; Wed, 4)

From: Jeff King <peff@peff.net>
Date: Oct 4, 2017, 08:31 UTC
Message-ID: <20171004083111.5y7su63scydg2yzk@sigill.intra.peff.net>
In-Reply-To: <xmqqy3orbcrr.fsf@gitster.mtv.corp.google.com>

On Wed, Oct 04, 2017 at 04:19:52PM +0900, Junio C Hamano wrote:

> I wanted to do v2.15-rc0 today but it seems that this has to slip,
> with too many topics still in flight in 'next' among which many are
> fixes, one is even a fix for a recent regression.

You probably already figured this out, but I want to be explicit just in case:

Show 14 quoted lines

> * tb/show-trailers-in-ref-filter (2017-10-02) 7 commits
>  - ref-filter.c: parse trailers arguments with %(contents) atom
>  - ref-filter.c: use trailer_opts to format trailers
>  - t6300: refactor %(trailers) tests
>  - doc: use "`<literal>`"-style quoting for literal strings
>  - doc: 'trailers' is the preferred way to format trailers
>  - t4205: unfold across multiple lines
>  - pretty.c: delimit "%(trailers)" arguments with ","
> 
>  "git for-each-ref --format=..." learned a new format element,
>  %(trailers), to show only the commit log trailer part of the log
>  message.
> 
>  Will merge to 'next'.

I think we want the first patch of this series to graduate before v2.15, even if the rest doesn't make it. It tweaks a new syntax introduced earlier in this cycle by jk/trailers-parse. If we ship without the tweak, then we'll have to support the colon-delimiter to remain backwards-compatible.

-Peff