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

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 25, 2017, 19:30 UTC
Message-ID: <xmqqy3rcuxec.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <alpine.DEB.2.21.1.1707252046190.4271@virtualbox>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 14 quoted lines

> Hi Junio,
>
> On Mon, 24 Jul 2017, Junio C Hamano wrote:
>
>> * js/blame-lib (2017-07-24) 1 commit
>>  - blame: fix memory corruption scrambling revision name in error message
>> 
>>  A hotfix to a topic already in 'master'.
>> 
>>  Will merge to 'next'.
>
> This sounds more critical than `next`, in particular since you said that
> you do not want to move anything from `next` to `master` before 2.14
> final.

That is why it is not "Will merge to and cook in 'next'" which is a norm for new things during -rc.

Show 6 quoted lines

>>  The final batch to "git rebase -i" updates to move more code from
>>  the shell script to C.
>> 
>>  Expecting a reroll.
>
> Since you said yourself that you won't pick up v6...

Read the message again and realize that I said won't during -rc but may hold onto it. I am intending to queue it on 2.14 final to merge to 'pu' until the topic is rerolled again.