mirror of
https://github.com/git/git
synced 2024-11-05 04:53:18 +00:00
8da56a4848
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>
8 lines
180 B
Text
8 lines
180 B
Text
/ { RIGHT /* Technically just supposed to be a slash and brace */
|
|
#size-cells = <1>;
|
|
|
|
/* This comment should be ignored */
|
|
|
|
some-property = <40+2>;
|
|
ChangeMe = <0xffeedd00>;
|
|
};
|