Skip to contentSkip to conversation

Kill warnings in Webserver Error Log

PATCH In review Jochen Roemling 2 participants 2 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Kill warnings in Webserver Error Log

The following patch kills two warnings in the Web Server Error Log:

[Mon May 30 21:24:15 2005] gitweb.cgi: "my" variable %co masks earlier declaration in same scope at /home/www/html/tools/cgi-bin/gitweb.cgi line 1658.
[Mon May 30 21:25:46 2005] gitweb.cgi: "my" variable %co masks earlier declaration in same scope at /home/www/html/tools/cgi-bin/gitweb.cgi line 1615.

There might be a patch offset of few lines because I deleted my local gitweb settings from the patch.

gitweb.cgi renamed from cgi-bin/gitweb.cgi.2 +1 -3
@@ -1616,7 +1618,7 @@
 		}
 		my @commit_lines = split "\n", $commit_text;
 		my $commit = shift @commit_lines;
-		my %co = git_read_commit($commit, \@commit_lines);
+		%co = git_read_commit($commit, \@commit_lines);
 		if (!%co) {
 			next;
 		}
@@ -1653,7 +1655,6 @@
 	$/ = "\n";
 	open $fd, "-|", "$gitbin/git-rev-list $hash | $gitbin/git-diff-tree 
-r --stdin -S$searchtext";
 	$alternate = 0;
-	my %co;
 	my @files;
 	while (my $line = <$fd>) {

if (%co && $line =~ m/^:([0-7]{6}) ([0-7]{6}) ([0-9a-fA-F]{40})
([0-9a-fA-F]{40}) (.)\t(.*)$/) {

#1 lore raw
Quoted 11 lines · Jochen Roemling

The following patch kills two warnings in the Web Server Error Log:

[Mon May 30 21:24:15 2005] gitweb.cgi: "my" variable %co masks earlier 
declaration in same scope at /home/www/html/tools/cgi-bin/gitweb.cgi 
line 1658.
[Mon May 30 21:25:46 2005] gitweb.cgi: "my" variable %co masks earlier 

declaration in same scope at /home/www/html/tools/cgi-bin/gitweb.cgi line 1615.

There might be a patch offset of few lines because I deleted my local gitweb settings from the patch.

Dou you get the version from:
ftp://ehlo.org/gitweb.cgi

It seems already fixed.

Thanks,
Kay