]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Don't pass "--xhtml" to hightlight in gitweb.perl script.
authorAdam Tkac <atkac@redhat.com>
Thu, 27 Jan 2011 12:51:51 +0000 (13:51 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jan 2011 20:13:07 +0000 (12:13 -0800)
The "--xhtml" option is supported only in highlight < 3.0. There is no option
to enforce (X)HTML output format compatible with both highlight < 3.0 and
highlight >= 3.0. However default output format is HTML so we don't need to
explicitly specify it.

Signed-off-by: Adam Tkac <atkac@redhat.com>
Helped-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
gitweb/gitweb.perl

index 1025c2f7165a7941ac8d13bff0e693cb3783b475..0779f12d6178c23a47f4b9a08152176d0e19a2a8 100755 (executable)
@@ -3468,7 +3468,7 @@ sub run_highlighter {
        close $fd;
        open $fd, quote_command(git_cmd(), "cat-file", "blob", $hash)." | ".
                  quote_command($highlight_bin).
-                 " --xhtml --fragment --syntax $syntax |"
+                 " --fragment --syntax $syntax |"
                or die_error(500, "Couldn't open file or run syntax highlighter");
        return $fd;
 }