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 [off-list ref]:

 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?

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 [off-list ref]

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

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

  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?

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

-Peff

Jeff King wrote:

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

quoted

  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?

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

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:

Darwin, anyone?

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

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

quoted

Darwin, anyone?

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

Yup, confirmed.

Arjen

-- 
Arjen Laarhoven

The presence of those seeking the truth is infinitely to be preferred to 
those who think they've found it.
                                -- Terry Pratchett, "Monstrous Regiment"

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

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

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

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 [off-list ref] writes:

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

quoted

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

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

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

Thanks, will do.