Skip to content

Commit

Permalink
userdiff/perl: match full line of POD headers
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jonathan Nieder authored and Junio C Hamano committed May 22, 2011
1 parent f12c66b commit 12f0967
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions t/t4018-diff-funcname.sh
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@ test_expect_success 'perl pattern is not distracted by sub within POD' '
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_config diff.java.funcname "!static
!String
Expand Down
2 changes: 1 addition & 1 deletion userdiff.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ PATTERNS("perl",
"^package .*;\n"
"^sub .* \\{\n"
"^[A-Z]+ \\{\n" /* BEGIN, END, ... */
"^=head[0-9] ", /* POD */
"^=head[0-9] .*", /* POD */
/* -- */
"[[:alpha:]_'][[:alnum:]_']*"
"|0[xb]?[0-9a-fA-F_]*"
Expand Down

0 comments on commit 12f0967

Please sign in to comment.