diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-20 00:14:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-20 00:14:17 -0800 |
| commit | 2c8fb23ac73cf1e17245cb58ec429c0b209ab19e (patch) | |
| tree | 8933176a38dbed424e8fef1b2b0202438c373d67 /gitweb/gitweb.perl | |
| parent | Sync with maint (diff) | |
| parent | Update draft release notes to 1.7.9.2 (diff) | |
| download | tgif-2c8fb23ac73cf1e17245cb58ec429c0b209ab19e.tar.xz | |
Merge branch 'maint'
* maint:
Update draft release notes to 1.7.9.2
gitweb: Fix 'grep' search for multiple matches in file
Diffstat (limited to 'gitweb/gitweb.perl')
| -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 3fc7380a5e..16d376075e 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -5915,9 +5915,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; |