From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Dec 2010 19:25:36 +0000 (-0800)
Subject: Merge branch 'bc/fortran-userdiff' into maint
X-Git-Tag: v1.7.3.3~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f3a70e9cc6d31e3cb8158f64be13c594226bf03f?hp=-c

Merge branch 'bc/fortran-userdiff' into maint

* bc/fortran-userdiff:
userdiff.c: add builtin fortran regex patterns
---

f3a70e9cc6d31e3cb8158f64be13c594226bf03f
diff --combined t/t4018-diff-funcname.sh
index c8e19372b0,9a57898339..0a61b57b5f
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@@ -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