summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Tkac <atkac@redhat.com>2011-01-27 12:51:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-01-27 20:13:07 (GMT)
commitd2d434beeb03e4ee648ca7ca2a1ea1ed09077306 (patch)
tree5dc7b8b30c186ba286bf1aa182caa72f306321a6
parent99e63ef24e18c8ca918922b052de96a8ceca48a4 (diff)
downloadgit-d2d434beeb03e4ee648ca7ca2a1ea1ed09077306.zip
git-d2d434beeb03e4ee648ca7ca2a1ea1ed09077306.tar.gz
git-d2d434beeb03e4ee648ca7ca2a1ea1ed09077306.tar.bz2
Don't pass "--xhtml" to hightlight in gitweb.perl script.
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>
-rwxr-xr-xgitweb/gitweb.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 1025c2f..0779f12 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -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;
}