undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

userdiff/perl: match full line of POD headers

Browse Source 
The builtin perl userdiff driver is not greedy enough about catching
POD header lines.  Capture the whole line, so instead of just
declaring that we are in some "@@ =head1" section, diff/grep output
can explain that the enclosing section is about "@@ =head1 OPTIONS".

Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2011-05-21 14:35:51 -05:00 committed by Junio C Hamano
parent f12c66b9bb
commit 12f0967a8a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t4018-diff-funcname.sh
View File

@ -125,6 +125,10 @@ test_expect_success 'perl pattern is not distracted by sub within POD' '
test_expect_funcname "=head" perl test_expect_funcname "=head" perl
' '
test_expect_success 'perl pattern gets full line of POD header' '
test_expect_funcname "=head1 SYNOPSIS\$" perl
'
test_expect_success 'custom pattern' ' test_expect_success 'custom pattern' '
test_config diff.java.funcname "!static test_config diff.java.funcname "!static
!String !String

2
userdiff.c
View File

@ -63,7 +63,7 @@ PATTERNS("perl",
"^package .*;\n" "^package .*;\n"
"^sub .* \\{\n" "^sub .* \\{\n"
"^[A-Z]+ \\{\n" /* BEGIN, END, ... */ "^[A-Z]+ \\{\n" /* BEGIN, END, ... */
"^=head[0-9] ", /* POD */ "^=head[0-9] .*", /* POD */
/* -- */ /* -- */
"[[:alpha:]_'][[:alnum:]_']*" "[[:alpha:]_'][[:alnum:]_']*"
"|0[xb]?[0-9a-fA-F_]*" "|0[xb]?[0-9a-fA-F_]*"