summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2008-02-21 00:01:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-21 04:21:43 (GMT)
commit14a5c7c19351a7db56803c9086b133fe131f55f6 (patch)
tree4b38915006ab5081ba52b50ea5372cebbbf83dd8
parent1bd38e8dcca03e318d6000d62cf74c541945a8ba (diff)
downloadgit-14a5c7c19351a7db56803c9086b133fe131f55f6.zip
git-14a5c7c19351a7db56803c9086b133fe131f55f6.tar.gz
git-14a5c7c19351a7db56803c9086b133fe131f55f6.tar.bz2
diff: fix java funcname pattern for solaris
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>
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index c30c252..699b21f 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{.*\\)$" },
};