diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/userdiff.c | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/userdiff.c')
| -rw-r--r-- | third_party/git/userdiff.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/third_party/git/userdiff.c b/third_party/git/userdiff.c index efbe05e5a5b6..e74a6d402255 100644 --- a/third_party/git/userdiff.c +++ b/third_party/git/userdiff.c @@ -23,28 +23,6 @@ IPATTERN("ada", "[a-zA-Z][a-zA-Z0-9_]*" "|[-+]?[0-9][0-9#_.aAbBcCdDeEfF]*([eE][+-]?[0-9_]+)?" "|=>|\\.\\.|\\*\\*|:=|/=|>=|<=|<<|>>|<>"), -PATTERNS("dts", - "!;\n" - "!=\n" - /* lines beginning with a word optionally preceded by '&' or the root */ - "^[ \t]*((/[ \t]*\\{|&?[a-zA-Z_]).*)", - /* -- */ - /* Property names and math operators */ - "[a-zA-Z0-9,._+?#-]+" - "|[-+*/%&^|!~]|>>|<<|&&|\\|\\|"), -PATTERNS("elixir", - "^[ \t]*((def(macro|module|impl|protocol|p)?|test)[ \t].*)$", - /* -- */ - /* Atoms, names, and module attributes */ - "[@:]?[a-zA-Z0-9@_?!]+" - /* Numbers with specific base */ - "|[-+]?0[xob][0-9a-fA-F]+" - /* Numbers */ - "|[-+]?[0-9][0-9_.]*([eE][-+]?[0-9_]+)?" - /* Operators and atoms that represent them */ - "|:?(\\+\\+|--|\\.\\.|~~~|<>|\\^\\^\\^|<?\\|>|<<<?|>?>>|<<?~|~>?>|<~>|<=|>=|===?|!==?|=~|&&&?|\\|\\|\\|?|=>|<-|\\\\\\\\|->)" - /* Not real operators, but should be grouped */ - "|:?%[A-Za-z0-9_.]\\{\\}?"), IPATTERN("fortran", "!^([C*]|[ \t]*!)\n" "!^[ \t]*MODULE[ \t]+PROCEDURE[ \t]\n" @@ -146,7 +124,7 @@ PATTERNS("php", "[a-zA-Z_][a-zA-Z0-9_]*" "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+" "|[-+*/<>%&^|=!.]=|--|\\+\\+|<<=?|>>=?|===|&&|\\|\\||::|->"), -PATTERNS("python", "^[ \t]*((class|(async[ \t]+)?def)[ \t].*)$", +PATTERNS("python", "^[ \t]*((class|def)[ \t].*)$", /* -- */ "[a-zA-Z_][a-zA-Z0-9_]*" "|[-+0-9.e]+[jJlL]?|0[xX]?[0-9a-fA-F]+[lL]?" |