diff options
| author |  Jakub Narebski <jnareb@gmail.com> | 2012-02-15 17:37:06 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-02-19 22:21:35 -0800 |
| commit | fc8fcd27e67ad06689a823dd83a929624e359cc1 (patch) | |
| tree | 979c8b7b1c9929a49b335f89b68924f3708adba1 /gitweb | |
| parent | Update draft release notes to 1.7.9.2 (diff) | |
| download | tgif-fc8fcd27e67ad06689a823dd83a929624e359cc1.tar.xz | |
gitweb: Fix 'grep' search for multiple matches in file
Commit ff7f218 (gitweb: Fix file links in "grep" search, 2012-01-05),
added $file_href variable, to reduce duplication and have the fix
applied in single place.
Unfortunately it made variable defined inside the loop, not taking into
account the fact that $file_href was set only if file changed.
Therefore for files with multiple matches $file_href was undefined for
second and subsequent matches.
Fix this bug by moving $file_href declaration outside loop.
Adds tests for almost all forms of sarch in gitweb, which were missing
from testuite. Note that it only tests if there are no warnings, and
it doesn't check that gitweb finds what it should find.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitweb')
| -rwxr-xr-x | gitweb/gitweb.perl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 6cfe8d932d..c876e0fb4e 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -5850,9 +5850,10 @@ sub git_search_files { my $alternate = 1; my $matches = 0; my $lastfile = ''; + my $file_href; while (my $line = <$fd>) { chomp $line; - my ($file, $file_href, $lno, $ltext, $binary); + my ($file, $lno, $ltext, $binary); last if ($matches++ > 1000); if ($line =~ /^Binary file (.+) matches$/) { $file = $1; |