diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:46 -0700 |
| commit | d3f09389731e186a978f095228431b1bb293b6f6 (patch) | |
| tree | 48c7f4f04a502fdafdd2d19238132e186d6e40d2 /userdiff.c | |
| parent | 49b46fde9f74b720fe3bc552caba55f6c1c3a0b1 (diff) | |
| parent | 1ab631647e3addd247c5482e8a3d4c9df7978c62 (diff) | |
| download | git-d3f09389731e186a978f095228431b1bb293b6f6.tar.xz | |
Merge branch 'kn/userdiff-php'
The userdiff pattern for .php has been updated.
* kn/userdiff-php:
userdiff: support new keywords in PHP hunk header
t4018: add missing test cases for PHP
Diffstat (limited to 'userdiff.c')
| -rw-r--r-- | userdiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c index a69241b25d..36af25e7f9 100644 --- a/userdiff.c +++ b/userdiff.c @@ -114,7 +114,7 @@ PATTERNS("perl", "|<<|<>|<=>|>>"), PATTERNS("php", "^[\t ]*(((public|protected|private|static)[\t ]+)*function.*)$\n" - "^[\t ]*(class.*)$", + "^[\t ]*((((final|abstract)[\t ]+)?class|interface|trait).*)$", /* -- */ "[a-zA-Z_][a-zA-Z0-9_]*" "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+" |