diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-01-13 11:36:12 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-01-13 11:36:12 -0800 |
commit | 17fd68d0d8f948c23993275aa618c16b83958cd8 (patch) | |
tree | 82d99e51767cd051998b01d7599eee83cc8b9537 | |
parent | Merge branch 'rj/svn-test' (diff) | |
parent | gitweb: remove unnecessary test when closing file descriptor (diff) | |
download | tgif-17fd68d0d8f948c23993275aa618c16b83958cd8.tar.xz |
Merge branch 'sr/gitweb-hilite-more'
* sr/gitweb-hilite-more:
gitweb: remove unnecessary test when closing file descriptor
gitweb: add extensions to highlight feature map
-rwxr-xr-x | gitweb/gitweb.perl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index c65af1a00a..4e3bf4a06b 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -250,13 +250,14 @@ our %highlight_ext = ( # main extensions, defining name of syntax; # see files in /usr/share/highlight/langDefs/ directory map { $_ => $_ } - qw(py c cpp rb java css php sh pl js tex bib xml awk bat ini spec tcl), + qw(py c cpp rb java css php sh pl js tex bib xml awk bat ini spec tcl sql make), # alternate extensions, see /etc/highlight/filetypes.conf 'h' => 'c', + map { $_ => 'sh' } qw(bash zsh ksh), map { $_ => 'cpp' } qw(cxx c++ cc), - map { $_ => 'php' } qw(php3 php4), + map { $_ => 'php' } qw(php3 php4 php5 phps), map { $_ => 'pl' } qw(perl pm), # perhaps also 'cgi' - 'mak' => 'make', + map { $_ => 'make'} qw(mak mk), map { $_ => 'xml' } qw(xhtml html htm), ); @@ -3464,8 +3465,7 @@ sub run_highlighter { my ($fd, $highlight, $syntax) = @_; return $fd unless ($highlight && defined $syntax); - close $fd - or die_error(404, "Reading blob failed"); + close $fd; open $fd, quote_command(git_cmd(), "cat-file", "blob", $hash)." | ". quote_command($highlight_bin). " --xhtml --fragment --syntax $syntax |" |