What's in git.git (Oct 2008, #03; Tue, 14)

Just trying to get my development repository back in sync with what I received from Shawn. Thanks to everybody, I think maint is ready for 1.6.0.3.

* The 'maint' branch has these fixes since the last announcement.

Junio C Hamano (1):
  Update draft release notes to 1.6.0.3

* The 'master' branch has these since the last announcement
  in addition to the above.

Jeff King (1):
  tests: shell negation portability fix

Junio C Hamano (1):
  Update draft release notes to 1.6.1

Two questions:

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

  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?

-brandon

2008/10/15 Brandon Casey <casey@nrlssc.navy.mil>:

Thanks for the reminder, I'd been meaning to recheck this. It appears that AIX doesn't require compat/regex now with the eregexes, so:

Tested-as-no-longer-required-by: Mike Ralphson <mike@abacus.co.uk>

Though I've just noticed my test counts don't actually add up...

fixed 1 success 3555 failed 0 broken 1 total 3559

8-)

Mike

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

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'.

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.

Junio C Hamano <gitster@pobox.com> wrote:

My fault. I didn't have a reason for putting it on master. My reason really boiled down to "I can't decide where this goes, oops, got distracted by something, git checkout master, git am, move on...".

Yes, it probably should have gone to maint.  No, it didn't go there.
Temporary lapse in maintainer judgement.
 

Probably.  Sorry for the cherry-pick being required here.

"Shawn O. Pearce" <spearce@spearce.org> writes:

That is Ok. I do the same all the time (and I try to rewind and rebuild when I spot it before pushing the results out, but I am not always successful).

I just wanted to see if there was any particular reason not to have this on 'maint'.

Thanks.

Junio C Hamano <gitster@pobox.com> wrote:

Oh, trust me, I had many times where I had to rebuild everything for that day's push because I forgot about a patch that should be in maint. At least your Meta/RB and Meta/PU scripts make it somewhat painless, that and Git's ability to just hard reset a branch back to what I last published. ;-)

I just utterly failed to do it that morning.  Or at least failed
to do it for this change.
 

Nope.

This test used the non-zero exit status of 'git diff' to indicate that a negated funcname pattern, when placed last, was correctly rejected.

The problem with this is that 'git diff' always returns non-zero if it finds differences in the files it is comparing, and the files must contain differences in order to trigger the funcname pattern codepath.

Instead of checking for non-zero exit status, make sure the expected error message is printed.

Signed-off-by: Brandon Casey <drafnel@gmail.com>
---

This is not really a series, but I expect you'll apply both, so this seems easier for both of us.

-brandon

 t/t4018-diff-funcname.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

On Wed, Oct 15, 2008 at 10:35:30AM -0500, Brandon Casey wrote:

t4018 passes without compat/regex on FreeBSD. Is that a sufficient test?

-Peff

Jeff King wrote:

I think so. t4018 makes sure all the patterns compile, and includes Arjen's test for appropriate handling of the alternation operator.

Darwin, anyone?

-brandon

On 16 okt 2008, at 17:21, Brandon Casey wrote:

'maint' passes for me on Darwin (OS X Leopard) after removing the regex stuff in Makefile

- Pieter

On Thu, Oct 16, 2008 at 05:37:10PM +0200, Pieter de Bie wrote:

Yup, confirmed.

Arjen

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

-- >8 --
Subject: Stop using compat/regex.c on platforms with working regexp library

We used to have non-POSIX comformant BRE in our code, and linked with GNU regexp library on a few platforms (Darwin, FreeBSD and AIX) to work it around. This was backwards.

We've fixed the broken regexps to use ERE that native regexp libraries on these platforms can handle just fine. There is no need to link with GNU regexp library on these platforms anymore.

Tested-on-AIX-by: Mike Ralphson <mike@abacus.co.uk>
Tested-on-FreeBSD-by: Jeff King <peff@peff.net>
Tested-on-Darwin-by: Arjen Laarhoven <arjen@yaph.org>
Tested-on-Darwin-by: Pieter de Bie <pieter@frim.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Makefile |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

On Tue, Oct 14, 2008 at 03:08:50PM -0700, Junio C Hamano wrote:

Can you cherry-pick this into maint? The problem it fixes was caused by 969c877, which is in maint (IOW, master is fixed, but maint is still broken).

-Peff

Jeff King <peff@peff.net> writes:

Thanks, will do.

Since the newline is not removed from lines before pattern matching, a pattern cannot match to the end of the line using the '$' operator without using an additional operator which will indirectly match the '\n' character.

Introduce a test which should pass, but which does not due to this flaw.

Signed-off-by: Brandon Casey <drafnel@gmail.com>
---
 t/t4018-diff-funcname.sh |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)