Junio C Hamano wrote: > Jakub Narebski <jnareb@xxxxxxxxx> writes: > > > Use new insert_file() subroutine to insert HTML chunks from external > > files: $site_header, $home_text (by default indextext.html), > > $site_footer, and $projectroot/$project/REAME.html. > > > > All non-ASCII chars of those files will be broken by Perl IO layer > > without decoding to utf8, so insert_file() does to_utf8() on each > > printed line; alternate solution would be to open those files with > > "binmode $fh, ':utf8'", or even all files with "use open qw(:std :utf8)". > > This is more complete solution that the one provided by Tatsuki Sugiura > > in original patch > > > > [PATCH] gitweb: fix encode handling for site_{header,footer} > > Msg-Id: <87vdumbxgc.wl@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> > > http://thread.gmane.org/gmane.comp.version-control.git/101199 > > It may be more complete but it is obviously untested. Please help me > trust you better with your future patches. Because I personally do not > run gitweb myself, I really need a trustworthy lieutenant(s) in the area. > > [Wed Dec 3 01:52:07 2008] gitweb.perl: Global symbol "$fd" requires explicit package name at /git.git/t/../gitweb/gitweb.perl line 4500. > [Wed Dec 3 01:52:07 2008] gitweb.perl: Execution of /git.git/t/../gitweb/gitweb.perl aborted due to compilation errors. > > > but it is in principle the same solution. > > > > I think this one as it is a bugfix should go in git 1.6.1 > > Trading a gitweb with a small bug with a gitweb that does not even pass > its test script does not feel like a good change to me. > > I think the breakage is the "close $fd" at the end of this hunk: [...] > I'll queue it to 'pu', with the "close $fd" removed, for now. I'm very sorry about that. It was a bit of time since my last patch sent, and I forgot that nevermind how obvious and simple the change, one should run relevant parts of test suite, or at least try to run gitweb / changed command. With "close $fd" removed the patch is correct (and patches t9500*). -- Jakub Narebski Poland -- To unsubscribe from this list: 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