From: Junio C Hamano <junkio@cox.net>
Date: Fri, 4 May 2007 06:26:54 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.2-rc2~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9aae177a4adff326421e55c7c0f3138de15ce2c1;p=git.git

Merge branch 'maint'

* maint:
  gitweb: use decode_utf8 directly
  posix compatibility for t4200
  Document 'opendiff' value in config.txt and git-mergetool.txt
  Allow PERL_PATH="/usr/bin/env perl"
  Make xstrndup common
  diff.c: fix "size cache" handling.
  http-fetch: Disable use of curl multi support for libcurl < 7.16.
---

9aae177a4adff326421e55c7c0f3138de15ce2c1
diff --cc gitweb/gitweb.perl
index cbd8d03e6,12c2e6685..ba5cc43e5
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@@ -1126,11 -1098,9 +1120,11 @@@ sub git_get_projects_list 
  			if (check_export_ok("$projectroot/$path")) {
  				my $pr = {
  					path => $path,
- 					owner => to_utf8($owner),
+ 					owner => decode_utf8($owner),
  				};
 -				push @list, $pr
 +				push @list, $pr;
 +				(my $forks_path = $path) =~ s/\.git$//;
 +				$paths{$forks_path}++;
  			}
  		}
  		close $fd;