Code

diff: fix java funcname pattern for solaris
authorJeff King <peff@peff.net>
Thu, 21 Feb 2008 00:01:16 +0000 (19:01 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Feb 2008 04:21:43 +0000 (20:21 -0800)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c

diff --git a/diff.c b/diff.c
index c30c252272d51f22e66ebf1b0c531f4bfa473651..699b21f4e347b38498e23ad5258a94cf4289bae9 100644 (file)
--- 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{.*\\)$" },
 };