diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-25 11:21:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-25 11:21:59 -0800 |
| commit | ba6b66281ebc8d863c2b0fb27ede640e4f212dd9 (patch) | |
| tree | 07666f6eef10a5f960d0a3bce3c97fdb391f680d /userdiff.c | |
| parent | bd72a08d6ce451e7d4725d6b3b411d482333e5cb (diff) | |
| parent | d1b1384d6163efb85c3a93ee535cd795d92fec21 (diff) | |
| download | git-ba6b66281ebc8d863c2b0fb27ede640e4f212dd9.tar.gz | |
Merge branch 'ln/userdiff-elixir'
Hotfix.
* ln/userdiff-elixir:
userdiff: remove empty subexpression from elixir regex
Diffstat (limited to 'userdiff.c')
| -rw-r--r-- | userdiff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c index 324916f20f..efbe05e5a5 100644 --- a/userdiff.c +++ b/userdiff.c @@ -34,8 +34,9 @@ PATTERNS("dts", "|[-+*/%&^|!~]|>>|<<|&&|\\|\\|"), PATTERNS("elixir", "^[ \t]*((def(macro|module|impl|protocol|p)?|test)[ \t].*)$", + /* -- */ /* Atoms, names, and module attributes */ - "|[@:]?[a-zA-Z0-9@_?!]+" + "[@:]?[a-zA-Z0-9@_?!]+" /* Numbers with specific base */ "|[-+]?0[xob][0-9a-fA-F]+" /* Numbers */ |