diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2019-10-20 11:52:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-21 17:44:12 +0900 |
| commit | 8da56a484800023a545d7a7c022473f5aa9e720f (patch) | |
| tree | e4feb0d793512ff670339b210a12346fade094db /userdiff.c | |
| parent | 3c81760bc66376c3ac69c39475cbe3b13e97e798 (diff) | |
| download | git-8da56a484800023a545d7a7c022473f5aa9e720f.tar.gz | |
userdiff: fix some corner cases in dts regex
While reviewing some dts diffs recently I noticed that the hunk header
logic was failing to find the containing node. This is because the regex
doesn't consider properties that may span multiple lines, i.e.
property = <something>,
<something_else>;
and it got hung up on comments inside nodes that look like the root node
because they start with '/*'. Add tests for these cases and update the
regex to find them. Maybe detecting the root node is too complicated but
forcing it to be a backslash with any amount of whitespace up to an open
bracket seemed OK. I tried to detect that a comment is in-between the
two parts but I wasn't happy so I just dropped it.
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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,._+?#-]+" |