diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:10 -0700 |
| commit | 13af774e263341eecdd67e6ca28ecc47d7997152 (patch) | |
| tree | ddc11e38a891d31f9387491755610ac11741db83 | |
| parent | Merge branch 'ls/travis-submitting-patches' into HEAD (diff) | |
| parent | gitweb: apply fallback encoding before highlight (diff) | |
| download | tgif-13af774e263341eecdd67e6ca28ecc47d7997152.tar.xz | |
Merge branch 'sk/gitweb-highlight-encoding' into HEAD
Some multi-byte encoding can have a backslash byte as a later part
of one letter, which would confuse "highlight" filter used in
gitweb.
* sk/gitweb-highlight-encoding:
gitweb: apply fallback encoding before highlight
| -rwxr-xr-x | gitweb/gitweb.perl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 05d7910b7c..2fddf750fa 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -3935,6 +3935,9 @@ sub run_highlighter { close $fd; open $fd, quote_command(git_cmd(), "cat-file", "blob", $hash)." | ". + quote_command($^X, '-CO', '-MEncode=decode,FB_DEFAULT', '-pse', + '$_ = decode($fe, $_, FB_DEFAULT) if !utf8::decode($_);', + '--', "-fe=$fallback_encoding")." | ". quote_command($highlight_bin). " --replace-tabs=8 --fragment --syntax $syntax |" or die_error(500, "Couldn't open file or run syntax highlighter"); |