On Mon, May 8, 2017 at 2:55 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> writes:
>
>> See the first patch for motivation & why.
>
> I do not think it quite explains the motivation, though. "Doing
> this way, we can keep in sync with the upstream more easily"? Or is
> there anything more to it, e.g. "and we need to update from the
> upstream now to fix this and that issues"?
It's just to bring us in line with upstream which as noted in that
commit has fixed the issues we locally patched (and more), and for us
to stop maintaining a fork of an old version of part of Gawk.
There's no known issue with the existing engine that I'm aware of
which impacts git, but given ~7 years of bugfixes & improvements
there's surely something.
> Having these "fixup!" as separate patches on the list makes them
> smaller and easier to understand. What do we want to do with them
> once they are applied? Squash them all up, because these do not
> have their own explanations in their log message and it is not worth
> keeping them separate?
Please squash them all up into this commit ("compat/regex: update the
gawk regex engine from upstream"), as noted having them as separate
patches was a hack to get around mailing list limits.
Also, un-squashed they'd break the NO_REGEX=Y build for a few commits,
which would be a pain during bisecting.
>> The only reason this has a cover letter is to explain the !fixup
>> commits. IIRC the mailing list has a 100K limit, which this series
>> would violate, so I split up the second commit.
>>
>> Consider all these !fixup commits to have by Signed-off-by, easier to
>> say that here than to modify them all.
>>
>> Ævar Arnfjörð Bjarmason (7):
>> compat/regex: add a README with a maintenance guide
>> compat/regex: update the gawk regex engine from upstream
>> fixup! compat/regex: update the gawk regex engine from upstream
>> fixup! compat/regex: update the gawk regex engine from upstream
>> fixup! compat/regex: update the gawk regex engine from upstream
>> fixup! compat/regex: update the gawk regex engine from upstream
>> fixup! compat/regex: update the gawk regex engine from upstream
>>
>> Makefile | 8 +-
>> compat/regex/README | 21 +
>> compat/regex/intprops.h | 448 +++++++++++++++++++++
>> .../0001-Add-notice-at-top-of-copied-files.patch | 120 ++++++
>> .../0002-Remove-verify.h-use-from-intprops.h.patch | 41 ++
>> compat/regex/regcomp.c | 356 +++++++++-------
>> compat/regex/regex.c | 32 +-
>> compat/regex/regex.h | 120 +++---
>> compat/regex/regex_internal.c | 118 +++---
>> compat/regex/regex_internal.h | 118 +++---
>> compat/regex/regexec.c | 242 +++++------
>> compat/regex/verify.h | 286 +++++++++++++
>> 12 files changed, 1487 insertions(+), 423 deletions(-)
>> create mode 100644 compat/regex/README
>> create mode 100644 compat/regex/intprops.h
>> create mode 100644 compat/regex/patches/0001-Add-notice-at-top-of-copied-files.patch
>> create mode 100644 compat/regex/patches/0002-Remove-verify.h-use-from-intprops.h.patch
>> create mode 100644 compat/regex/verify.h