summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Matthieu Moy <Matthieu.Moy@imag.fr>2014-04-23 16:34:29 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-23 15:22:54 -0700
commit9742fb7e53b2f3bd85b5f01e563aee2cad7e77b8 (patch)
treec179274f84a0f741099f018e1999588aecf504ef /Documentation/git-merge-one-file.txt
parentgit-remote-mediawiki: allow stop/start-ing the test server (diff)
downloadtgif-9742fb7e53b2f3bd85b5f01e563aee2cad7e77b8.tar.xz
git-remote-mediawiki: fix encoding issue for UTF-8 media files
When a media file contains valid UTF-8, git-remote-mediawiki tried to be too clever about the encoding, and the call to utf8::downgrade() on the downloaded content was failing with Wide character in subroutine entry at git-remote-mediawiki line 583. Instead, use $response->decode() to apply decoding linked to the Content-Encoding: header, and return the content without attempting any charset decoding. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions