git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Whit Armstrong <armstrong.whit@gmail.com>, git@vger.kernel.org
Subject: [PATCH 3/3] diff: fix java funcname pattern for solaris
Date: Wed, 20 Feb 2008 19:01:16 -0500	[thread overview]
Message-ID: <20080221000115.GC6429@coredump.intra.peff.net> (raw)
In-Reply-To: <20080220235944.GA6278@coredump.intra.peff.net>

The Solaris regex library doesn't like having the '$' anchor
inside capture parentheses. It rejects the match, causing
t4018 to fail.

Signed-off-by: Jeff King <peff@peff.net>
---
 diff.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/diff.c b/diff.c
index 58fe775..0f18ee9 100644
--- a/diff.c
+++ b/diff.c
@@ -1199,7 +1199,7 @@ static struct builtin_funcname_pattern {
 			"new\\|return\\|switch\\|throw\\|while\\)\n"
 			"^[ 	]*\\(\\([ 	]*"
 			"[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
-			"[ 	]*([^;]*$\\)" },
+			"[ 	]*([^;]*\\)$" },
 	{ "tex", "^\\(\\\\\\(sub\\)*section{.*\\)$" },
 };
 
-- 
1.5.4.2.247.g107bd

  parent reply	other threads:[~2008-02-21  0:01 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-20 23:59 [PATCH 0/3] solaris test results Jeff King
2008-02-21  0:00 ` [PATCH 1/3] git_config_*: don't assume we are parsing a config file Jeff King
2008-02-21  0:00 ` [PATCH 2/3] t3404: use configured shell instead of /bin/sh Jeff King
2008-02-23 20:13   ` Johannes Sixt
2008-02-23 20:26     ` Junio C Hamano
2008-02-23 20:34     ` Junio C Hamano
2008-02-23 21:09       ` Johannes Sixt
2008-02-23 21:15         ` Jeff King
2008-02-23 21:56           ` Junio C Hamano
2008-02-23 22:39             ` Jeff King
2008-02-23 22:46               ` Junio C Hamano
2008-02-23 22:49                 ` Jeff King
2008-02-23 22:55                   ` Junio C Hamano
2008-02-23 23:12                     ` Jeff King
2008-02-24  0:03                       ` Junio C Hamano
2008-02-24 19:40                         ` Jeff King
2008-02-23 20:40     ` Jeff King
2008-02-23 20:50       ` Junio C Hamano
2008-02-23 21:12         ` Jeff King
2008-02-23 22:28           ` Jeff King
2008-02-23 22:35             ` Junio C Hamano
2008-02-23 22:44               ` Jeff King
2008-02-21  0:01 ` Jeff King [this message]
2008-02-21  0:34 ` [PATCH 0/3] solaris test results Junio C Hamano
2008-02-21  0:41   ` Jeff King
2008-02-22  5:26     ` Junio C Hamano
2008-02-22  5:29       ` Junio C Hamano
2008-02-22  5:42       ` Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080221000115.GC6429@coredump.intra.peff.net \
    --to=peff@peff.net \
    --cc=armstrong.whit@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).