Merge branch 'bc/fortran-userdiff' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 19:25:36 +0000 (11:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 19:25:36 +0000 (11:25 -0800)
* bc/fortran-userdiff:
userdiff.c: add builtin fortran regex patterns

1  2 
t/t4018-diff-funcname.sh
diff --combined t/t4018-diff-funcname.sh
index c8e19372b00f128646b809e1f5723d88b58a3f30,9a57898339dbcc44a6c7bdb0534db1290d7a1aa6..0a61b57b5f6f00ae4c0734a34ce45c0ba1fcf098
@@@ -32,18 -32,18 +32,18 @@@ EO
  
  sed 's/beer\\/beer,\\/' < Beer.java > Beer-correct.java
  
- builtin_patterns="bibtex cpp csharp html java objc pascal php python ruby tex"
+ builtin_patterns="bibtex cpp csharp fortran html java objc pascal php python ruby tex"
  for p in $builtin_patterns
  do
        test_expect_success "builtin $p pattern compiles" '
                echo "*.java diff=$p" > .gitattributes &&
 -              ! ( git diff --no-index Beer.java Beer-correct.java 2>&1 |
 -                      grep "fatal" > /dev/null )
 +              ! { git diff --no-index Beer.java Beer-correct.java 2>&1 |
 +                      grep "fatal" > /dev/null; }
        '
        test_expect_success "builtin $p wordRegex pattern compiles" '
 -              ! ( git diff --no-index --word-diff \
 +              ! { git diff --no-index --word-diff \
                        Beer.java Beer-correct.java 2>&1 |
 -                      grep "fatal" > /dev/null )
 +                      grep "fatal" > /dev/null; }
        '
  done