From: Jakub Narebski <redacted>
Date: Wed, 15 Feb 2012 16:37:06 +0000 (+0100)
Subject: gitweb: Fix 'grep' search for multiple matches in file
X-Git-Url: https://git.ladys.computer/Gitweb/commitdiff_plain/522dd2e5ade08a3349a0fe5fb0df8b72f391fd93208825b19cc151d3e6227a5f?hp=053713b077eb87270f5bfa4e015a537848ba230a9973231eeaf409dfa2b158dd

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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
---

diff --git a/gitweb.perl b/gitweb.perl
index 1ab150d..8ed2ba1 100755
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -5916,9 +5916,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;