Skip to content
Browse files

userdiff/perl: match full line of POD headers

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...
1 parent f12c66b commit 12f0967a8a1e3c11c678de181f77d1c7883b37cf @jrn jrn committed with gitster May 21, 2011
Showing with 5 additions and 1 deletion.
  1. +4 −0 t/t4018-diff-funcname.sh
  2. +1 −1 userdiff.c
View
4 t/t4018-diff-funcname.sh
@@ -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
View
2 userdiff.c
@@ -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_]*"

0 comments on commit 12f0967

Please sign in to comment.
Something went wrong with that request. Please try again.