mirror of
https://github.com/git/git.git
synced 2026-01-20 22:07:19 +09:00
Merge branch 'jn/web' into next
This commit is contained in:
commit
02ca920481
@ -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');
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user