t4018-diff-funcname: test syntax of builtin xfuncname patterns

[jc: fixes bibtex pattern breakage exposed by this test]

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diff.c b/diff.c
index 0f98bff46b222bcf36347fccbaf18a056dd64135..05dd8f0b566df29ff1dbe1e03db8b50f309d2329 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1404,7 +1404,7 @@ static const struct funcname_pattern_entry *funcname_pattern(const char *ident)
 }
 
 static const struct funcname_pattern_entry builtin_funcname_pattern[] = {
 }
 
 static const struct funcname_pattern_entry builtin_funcname_pattern[] = {

-       { "bibtex", "(@[a-zA-Z]{1,}[ \t]*\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
+       { "bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",

          REG_EXTENDED },
        { "html", "^[ \t]*(<[Hh][1-6][ \t].*>.*)$", REG_EXTENDED },
        { "java",
          REG_EXTENDED },
        { "html", "^[ \t]*(<[Hh][1-6][ \t].*>.*)$", REG_EXTENDED },
        { "java",

diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 99fff973eb2479d7ec599b8fd298d4a970176244..520e095c597a61f0f263a274a53ae0aa2781da85 100755 (executable)
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -32,7 +32,7 @@ EOF
 
 sed 's/beer\\/beer,\\/' < Beer.java > Beer-correct.java
 
 
 sed 's/beer\\/beer,\\/' < Beer.java > Beer-correct.java
 

-builtin_patterns="bibtex java pascal ruby tex"
+builtin_patterns="bibtex html java pascal php python ruby tex"

 for p in $builtin_patterns
 do
        test_expect_success "builtin $p pattern compiles" '
 for p in $builtin_patterns
 do
        test_expect_success "builtin $p pattern compiles" '