diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-10-23 14:43:10 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-23 14:43:10 +0900 |
| commit | 2e215b7959a895d6aadbb828622bef966738ed6a (patch) | |
| tree | b74c6ac48f68f18c5188e0b3d2aa081cf0e75c38 /userdiff.c | |
| parent | e3cf08361ae5a277d4cdfbd923f63e8c18634032 (diff) | |
| parent | 8da56a484800023a545d7a7c022473f5aa9e720f (diff) | |
| download | git-2e215b7959a895d6aadbb828622bef966738ed6a.tar.gz | |
Merge branch 'sb/userdiff-dts'
Tweak userdiff patterns for dts.
* sb/userdiff-dts:
userdiff: fix some corner cases in dts 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 86e3244e15..e187d356f6 100644 --- a/userdiff.c +++ b/userdiff.c @@ -25,8 +25,9 @@ IPATTERN("ada", "|=>|\\.\\.|\\*\\*|:=|/=|>=|<=|<<|>>|<>"), PATTERNS("dts", "!;\n" + "!=\n" /* lines beginning with a word optionally preceded by '&' or the root */ - "^[ \t]*((/|&?[a-zA-Z_]).*)", + "^[ \t]*((/[ \t]*\\{|&?[a-zA-Z_]).*)", /* -- */ /* Property names and math operators */ "[a-zA-Z0-9,._+?#-]+" |