From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Oct 2008 19:38:56 GMT
Subject: Re: What's in git.git (Oct 2008, #03; Tue, 14)
Message-ID: <7vljwpr6lr.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <bsftmRx17krWBpVlulipoJEO1fWsD0hZfF3HOZcajX6GV66RKW8W6A@cipher.nrlssc.navy.mil>

Brandon Casey <casey@nrlssc.navy.mil> writes:

> Two questions:
>
>   1) Should a5a5a048 be in maint?
>      "xdiff-interface.c: strip newline (and cr) from line before pattern matching"

I would have forked a maint-fix topic to prepare a merge of this fix to
both 'maint' and 'master' but apparently this was applied directly on
'master'.  I may be missing a valid reason why Shawn did it this way.

If we can add a test case to demonstrate the existing breakage, I think we
can (and should) cherry-pick it to 'maint'.

>   2) Do we want to stick with compat/regex on
>
>       Darwin: Arjen
>      FreeBSD: Jeff
>          AIX: Mike
>
>      now that the builtin funcname patterns have been converted to Extended
>      Regular Expressions?

Mike already said AIX does not need to, and I expect others would say
their native regexp library can grok ERE just fine.  Let's wait for others
to confirm and then remove the compat/regex thing.