Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix
* bc/maint-diff-hunk-header-fix: t4018-diff-funcname: test syntax of builtin xfuncname patterns
This commit is contained in:
commit
4be4680cbb
@ -32,7 +32,18 @@ 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"
|
||||||
|
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 )
|
||||||
|
'
|
||||||
|
done
|
||||||
|
|
||||||
test_expect_success 'default behaviour' '
|
test_expect_success 'default behaviour' '
|
||||||
|
rm -f .gitattributes &&
|
||||||
git diff --no-index Beer.java Beer-correct.java |
|
git diff --no-index Beer.java Beer-correct.java |
|
||||||
grep "^@@.*@@ public class Beer"
|
grep "^@@.*@@ public class Beer"
|
||||||
'
|
'
|
||||||
|
Loading…
Reference in New Issue
Block a user