Re: [PATCH] Pass "-O xhtml" param to highlight instead of "-xhtml"
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Jan 26, 2011, 21:34 UTC
- Message-ID
- <m339ofbb9t.fsf@localhost.localdomain>
- In-Reply-To
- <20110126171118.GA867@traged.englab.brq.redhat.com>
Adam Tkac <atkac@redhat.com> writes:
> Hello, > > attached patch fixes the gitweb.perl script.
Please don't send patches as attachements, but inline. See Documentation/SubmittingPatches
> Current highlight utility doesn't recognize "--xhtml" parameter, it > recognizes only "-O xhtml" parameter. > > Reference: https://bugzilla.redhat.com/show_bug.cgi?id=672293
Shouldn't the above be in commit message?
> Subject: [PATCH] Pass "-O xhtml" parameter instead of "--xhtml" to hightlight in gitweb.
Why the mismatch between subject of email, and subject in attached patch?
Show 19 quoted lines
> 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;
> }In highlight 2.4.5 '-O' means "name of output directory", i.e. --outdir. There is no --out-format either.
WTF this backward incompatibile change in highlight... the only solution that would make it work both for old and for new versions is to rely on the fact that HTML is default output format, i.e.
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");
-- Jakub Narebski Poland ShadeHawk on #git