diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-05-22 12:29:32 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-23 11:39:13 -0700 |
| commit | f143d9c695cd4c3e86069c536fa0dff04fc93e93 (patch) | |
| tree | ec5c49d1151fd23fb3e985d9cd7925fca3c49089 /userdiff.c | |
| parent | f5b7ce1b9041d19658b79d8b956d7e79ec6006bd (diff) | |
| download | git-f143d9c695cd4c3e86069c536fa0dff04fc93e93.tar.gz | |
userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters
A naive method of treating BEGIN/END blocks with a brace on the second
line as diff/grep funcname context involves also matching unrelated
lines that consist of all-caps letters:
sub foo {
print <<'EOF'
text goes here
...
EOF
... rest of foo ...
}
That's not so great, because it means that "git diff" and "git grep
--show-function" would write "=EOF" or "@@ EOF" as context instead of
a more useful reminder like "@@ sub foo {".
To avoid this, tighten the pattern to only match the special block
names that perl accepts (namely BEGIN, END, INIT, CHECK, UNITCHECK,
AUTOLOAD, and DESTROY). The list is taken from perl's toke.c.
Suggested-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'userdiff.c')
| -rw-r--r-- | userdiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c index 42b86ac63d..e55310cd02 100644 --- a/userdiff.c +++ b/userdiff.c @@ -74,7 +74,7 @@ PATTERNS("perl", "(:[^;#]*)?" "(\\{[ \t]*)?" /* brace can come here or on the next line */ "(#.*)?$\n" /* comment */ - "^[A-Z]+[ \t]*" /* BEGIN, END, ... */ + "^(BEGIN|END|INIT|CHECK|UNITCHECK|AUTOLOAD|DESTROY)[ \t]*" "(\\{[ \t]*)?" /* brace can come here or on the next line */ "(#.*)?$\n" "^=head[0-9] .*", /* POD */ |