path: root/userdiff.c
diff options
authorStephen Boyd <>2019-10-20 18:52:30 (GMT)
committerJunio C Hamano <>2019-10-21 08:44:12 (GMT)
commit8da56a484800023a545d7a7c022473f5aa9e720f (patch)
treee4feb0d793512ff670339b210a12346fade094db /userdiff.c
parent3c81760bc66376c3ac69c39475cbe3b13e97e798 (diff)
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 <> Cc: Frank Rowand <> Signed-off-by: Stephen Boyd <> Reviewed-by: Johannes Sixt <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'userdiff.c')
1 files changed, 2 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c
index 86e3244..e187d35 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -25,8 +25,9 @@ IPATTERN("ada",
+ "!=\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 */