Re: What's cooking in git.git (May 2017, #08; Mon, 29)

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 1, 2017, 00:48 UTC
Message-ID: <xmqqr2z48rdo.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CACBZZX6YFKTLKxep2oW0_HrX+kNJ2PX5G4UCboB+4yosmLqr5g@mail.gmail.com>

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

Show 20 quoted lines

> On Mon, May 29, 2017 at 8:23 AM, Junio C Hamano <gitster@pobox.com> wrote:
>> * ab/pcre-v2 (2017-05-26) 7 commits
>>  - grep: add support for PCRE v2
>>  - grep: un-break building with PCRE < 8.20
>>  - grep: un-break building with PCRE < 8.32
>>  - grep: add support for the PCRE v1 JIT API
>>  - log: add -P as a synonym for --perl-regexp
>>  - grep: skip pthreads overhead when using one thread
>>  - grep: don't redundantly compile throwaway patterns under threading
>>  (this branch uses ab/grep-preparatory-cleanup.)
>>
>>  Update "perl-compatible regular expression" support to enable JIT
>>  and also allow linking with the newer PCRE v2 library.
>>
>>  Will merge to 'next'.
>
> First a general question: When you say "will merge" in these E-Mails,
> that means "before the next what's cooking in ~7 days, right? I.e. if
> there's no issues in a given series does the pu->next->master cycle
> take 3wks?

No.  "What's cooking" is not even once-per-week to begin with ;-)

These merely mean "the current plan is to merge this, not in too far distant future, and not until the message hits the mailing list, but the plan can change based on bug reports and people are encouraged to find and report blocking issues before such a merge happens, thanks".

Depending on many factors (the impact of the topic, the complexity of the changes, etc.), the time a series spends in each stage differs. A truly trivially correct change may already have been in 'next' for a few days when the first issue of "What's cooking" report that mentions it is sent out and the topic may graduate to 'master' two days later. A more complex series may have to spend more than a few weeks in 'next' before getting merged to 'master'.

> Anyway, the PCRE v1 set of JIT patches break builds on PCRE compiled
> with --disable-jit, which is apparently Johannes's Windows
> configuration.

OK.  Thanks for reporting and stopping me.  I'll mark it as such...

> And a perf test in a commit message that makes no sense since I split
> up the PCRE v1 patch.

... and wait for an update.