All of lore.kernel.org
 help / color / mirror / Atom feed
From: Adam Tkac <atkac@redhat.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH] Pass "-O xhtml" param to highlight instead of "-xhtml"
Date: Wed, 26 Jan 2011 18:11:19 +0100	[thread overview]
Message-ID: <20110126171118.GA867@traged.englab.brq.redhat.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 265 bytes --]

Hello,

attached patch fixes the gitweb.perl script. Current highlight utility
doesn't recognize --xhtml parameter, it recognizes only "-O xhtml" parameter.

Reference: https://bugzilla.redhat.com/show_bug.cgi?id=672293

Regards, Adam

-- 
Adam Tkac, Red Hat, Inc.

[-- Attachment #2: 0001-Pass-O-xhtml-parameter-instead-of-xhtml-to-hightligh.patch --]
[-- Type: text/plain, Size: 930 bytes --]

>From ec8043a730c165d8b438ccaba7c3cf5dc5fa65bc Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Wed, 26 Jan 2011 17:46:29 +0100
Subject: [PATCH] Pass "-O xhtml" parameter instead of "--xhtml" to hightlight in gitweb.

Signed-off-by: Jochen Schmitt <jochen@herr-schmitt.de>
Signed-off-by: Adam Tkac <atkac@redhat.com>
---
 gitweb/gitweb.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 1025c2f..88556f4 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 |"
+	          " -O xhtml --fragment --syntax $syntax |"
 		or die_error(500, "Couldn't open file or run syntax highlighter");
 	return $fd;
 }
-- 
1.7.3.5


             reply	other threads:[~2011-01-26 17:13 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-26 17:11 Adam Tkac [this message]
2011-01-26 21:34 ` [PATCH] Pass "-O xhtml" param to highlight instead of "-xhtml" Jakub Narebski
2011-01-26 21:43   ` Junio C Hamano
2011-01-27 12:03     ` Adam Tkac
2011-01-27 12:51       ` [PATCH] Don't pass "--xhtml" to hightlight in gitweb.perl script Adam Tkac

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110126171118.GA867@traged.englab.brq.redhat.com \
    --to=atkac@redhat.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.