Junio C Hamano wrote: > Jakub Narebski <jnareb@xxxxxxxxx> writes: > >> @@ -326,7 +326,7 @@ EOF >> } elsif (defined $hash) { >> $search_hash = $hash; >> } else { >> - $search_hash = "HEAD"; >> + $search_hash = "HEAD"; >> } >> $cgi->param("a", "search"); >> $cgi->param("h", $search_hash); > > My copy from "next" has this part like the following: > > if (!defined $searchtext) { > $searchtext = ""; > } > my $search_hash; > if (defined $hash) { > $search_hash = $hash; > } else { > $search_hash = "HEAD"; > } > > I thought we were both reasonably sure that we are now in > sync... I could apply it by hand but once I start doing that > I'm afraid we will never converge. > > It's quite frustrating. I'm very sorry, I forgot that I applied Timo Hirvonen patch "[PATCH] gitweb: Start search from HEAD" (<20060620152515.23e59396.tihirvon@xxxxxxxxx>) http://permalink.gmane.org/gmane.comp.version-control.git/22197> on top of 'next'. This patch fixes search quite nicely, reducing significantly number of error messages during search (e.g. starting search from blob or file view). Any reason not to apply it? >> my $path = esc_html(chop_str($proj{'path'}, 25, 5)); >> - my $rss = "$my_url?p=$proj{'path'};a=rss"; >> - my $html = "$my_url?p=$proj{'path'};a=summary"; >> + my $rss = "$my_url?p=$proj{'path'};a=rss"; >> + my $html = "$my_url?p=$proj{'path'};a=summary"; > > Are you sure you want to do "my $rss two-spaces equal space"? > > I've fixed up the whitespace you missed and will be applying the > following on top of what is in "next" tonight. > > -- >8 -- > gitweb: do not align assignment = with extra whitespaces My idea for coding style is to align assignment = with extra whitespaces, but only where aligned assignments statements are one after another. The above "my $rss" example was mistyped as " = " instead of " = ", but I think it was meant to be aligned at '='. IMHO aligning at assign makes code more readable. But that is just my opinion. -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html