From 12f0967a8a1e3c11c678de181f77d1c7883b37cf Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Sat, 21 May 2011 14:35:51 -0500 Subject: [PATCH] userdiff/perl: match full line of POD headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- t/t4018-diff-funcname.sh | 4 ++++ userdiff.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh index f071a8fdd1..8a5714912d 100755 --- a/t/t4018-diff-funcname.sh +++ b/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 diff --git a/userdiff.c b/userdiff.c index 2cca0af8e2..32ead9654a 100644 --- a/userdiff.c +++ b/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_]*"