summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-20 10:00:13 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-20 10:00:13 (GMT)
commit02ca920481dbc3740087986b15b89cf6433cf58e (patch)
tree34777f38b374a829685500c1425cfbf95488da72
parent753fa210ccd603c204c562af2cf3ebd7d3a3047a (diff)
parent57bd4d3523efecf60197040cad34154aff4ddf80 (diff)
downloadgit-02ca920481dbc3740087986b15b89cf6433cf58e.zip
git-02ca920481dbc3740087986b15b89cf6433cf58e.tar.gz
git-02ca920481dbc3740087986b15b89cf6433cf58e.tar.bz2
Merge branch 'jn/web' into next
-rwxr-xr-xgitweb/gitweb.cgi2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/gitweb.cgi b/gitweb/gitweb.cgi
index d7da636..78e6dd0 100755
--- a/gitweb/gitweb.cgi
+++ b/gitweb/gitweb.cgi
@@ -1518,7 +1518,7 @@ sub mimetype_guess {
if ($mimetypes_file) {
my $file = $mimetypes_file;
- $file =~ m#^/# or $file = "$projectroot/$path/$file";
+ #$file =~ m#^/# or $file = "$projectroot/$path/$file";
$mime = mimetype_guess_file($filename, $file);
}
$mime ||= mimetype_guess_file($filename, '/etc/mime.types');