Re: [PATCH] Fix wrong xhtml option to highlight

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH] Fix wrong xhtml option to highlight

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:50:27

Jochen Schmitt [off-list ref] writes:
quoted hunk
---
Hallo,

because I'm the maintainer of the highlight package in the
Fedora Project I was notified, that highlight doesn't works
properly with gitweb in BZ #672293.

So I have create the following simple patch to solve the 
reported issue.

Best Regards

Jochen Schmitt

 gitweb/gitweb.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 1025c2f..b662420 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 |"
+	          " -xhtml --fragment --syntax $syntax |"
Curious.

Does the command take double-dash for the fragment and syntax options but
a single dash for the xhtml option?  Really...

A few top hits returned by Google for "highlight manual page" tells me
otherwise.

Re: [PATCH] Fix wrong xhtml option to highlight

From: Drew Northup <hidden>
Date: 2016-06-15 22:50:27

On Mon, 2011-01-24 at 14:48 -0800, Junio C Hamano wrote:
Jochen Schmitt [off-list ref] writes:
quoted
---
Hallo,

because I'm the maintainer of the highlight package in the
Fedora Project I was notified, that highlight doesn't works
properly with gitweb in BZ #672293.

So I have create the following simple patch to solve the 
reported issue.

Best Regards

Jochen Schmitt

 gitweb/gitweb.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 1025c2f..b662420 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 |"
+	          " -xhtml --fragment --syntax $syntax |"
Curious.

Does the command take double-dash for the fragment and syntax options but
a single dash for the xhtml option?  Really...

A few top hits returned by Google for "highlight manual page" tells me
otherwise.
Certainly appears to be the case that "--xhtml" is the option in Ubuntu
10.04.1 LTS. 

Jochen,
Did you mean "-X" (which sets the same option)?

-- 
-Drew Northup
________________________________________________
"As opposed to vegetable or mineral error?"
-John Pescatore, SANS NewsBites Vol. 12 Num. 59
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help