diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-10 11:46:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-10 11:46:27 -0700 |
| commit | 6dbe1b4ee21bb52b2069fc0330915483ec020386 (patch) | |
| tree | 4562d5185d7092271803eb56f7850ccd05fac724 | |
| parent | Merge branch 'tk/fast-export-anonymized-tag-fix' (diff) | |
| parent | userdiff: support enum keyword in PHP hunk header (diff) | |
| download | tgif-6dbe1b4ee21bb52b2069fc0330915483ec020386.tar.xz | |
Merge branch 'uk/userdiff-php-enum'
Update the userdiff pattern for PHP.
* uk/userdiff-php-enum:
userdiff: support enum keyword in PHP hunk header
| -rw-r--r-- | t/t4018/php-enum | 4 | ||||
| -rw-r--r-- | userdiff.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/t/t4018/php-enum b/t/t4018/php-enum new file mode 100644 index 0000000000..91a69c1a2b --- /dev/null +++ b/t/t4018/php-enum @@ -0,0 +1,4 @@ +enum RIGHT: string +{ + case Foo = 'ChangeMe'; +} diff --git a/userdiff.c b/userdiff.c index b073e5563b..af02b1878c 100644 --- a/userdiff.c +++ b/userdiff.c @@ -228,7 +228,7 @@ PATTERNS("perl", "|<<|<>|<=>|>>"), PATTERNS("php", "^[\t ]*(((public|protected|private|static|abstract|final)[\t ]+)*function.*)$\n" - "^[\t ]*((((final|abstract)[\t ]+)?class|interface|trait).*)$", + "^[\t ]*((((final|abstract)[\t ]+)?class|enum|interface|trait).*)$", /* -- */ "[a-zA-Z_][a-zA-Z0-9_]*" "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+" |