gitweb: Add a feature to show side-by-side diff

diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index f071a8fdd11eb9da650488fee18995ad9905441f..b68c56b68c0f80a0d96b513733bc5fb17db6fed4 100755 (executable)
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -29,13 +29,17 @@ public class Beer
 }
 EOF
 sed 's/beer\\/beer,\\/' <Beer.java >Beer-correct.java
-cat >Beer.perl <<\EOF
+cat >Beer.perl <<\EOT
 package Beer;
 
 use strict;
 use warnings;
 use parent qw(Exporter);
-our @EXPORT_OK = qw(round);
+our @EXPORT_OK = qw(round finalround);
+
+sub other; # forward declaration
+
+# hello
 
 sub round {
        my ($n) = @_;
@@ -46,6 +50,21 @@ sub round {
        print "$n bottles of beer on the wall.\n";
 }
 
+sub finalround
+{
+       print "Go to the store, buy some more\n";
+       print "99 bottles of beer on the wall.\n");
+}
+
+sub withheredocument {
+       print <<"EOF"
+decoy here-doc
+EOF
+       # some lines of context
+       # to pad it out
+       print "hello\n";
+}
+
 __END__
 
 =head1 NAME
@@ -54,20 +73,23 @@ Beer - subroutine to output fragment of a drinking song
 
 =head1 SYNOPSIS
 
-       use Beer qw(round);
+       use Beer qw(round finalround);
 
        sub song {
                for (my $i = 99; $i > 0; $i--) {
                        round $i;
                }
+               finalround;
        }
 
        song;
 
 =cut
-EOF
+EOT
 sed -e '
+       s/hello/goodbye/
        s/beer\\/beer,\\/
+       s/more\\/more,\\/
        s/song;/song();/
 ' <Beer.perl >Beer-correct.perl
 
@@ -121,10 +143,26 @@ test_expect_success 'preset perl pattern' '
        test_expect_funcname "sub round {\$" perl
 '
 
+test_expect_success 'perl pattern accepts K&R style brace placement, too' '
+       test_expect_funcname "sub finalround\$" perl
+'
+
+test_expect_success 'but is not distracted by end of <<here document' '
+       test_expect_funcname "sub withheredocument {\$" perl
+'
+
 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 'perl pattern is not distracted by forward declaration' '
+       test_expect_funcname "package Beer;\$" perl
+'
+
 test_expect_success 'custom pattern' '
        test_config diff.java.funcname "!static
 !String