viewvcs: use :utf8 for opening patch, too

We'll also force --encoding=UTF-8 for "git show" even
if that's the default in git, since the rest of our code
already assumes UTF-8.

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index 96883f6c..19d34092 100644
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -144,7 +144,7 @@ committer $co$patchid
 <b>$s</b>\n
 EOM
         $ctx->zmore($bdy);
-        open $fh, '<', "$tmp/p" or die "open $tmp/p: $!";
+        open $fh, '<:utf8', "$tmp/p" or die "open $tmp/p: $!";
         if (-s $fh > $MAX_SIZE) {
                 $ctx->zmore("---\n patch is too large to show\n");
         } else { # prepare flush_diff:
@@ -171,8 +171,10 @@ sub show_commit ($$$$) {
         # a patch embedded inside the commit message body doesn't get fed
         # to patch-id:
         my $cmd = [ '/bin/sh', '-c',
-                "git show '$SHOW_FMT' -z --no-notes --no-patch $oid >h && ".
-                "git show --pretty=format:%n -M --stat -p $oid >p && ".
+                "git show --encoding=UTF-8 '$SHOW_FMT'".
+                " -z --no-notes --no-patch $oid >h && ".
+                'git show --encoding=UTF-8 --pretty=format:%n -M'.
+                " --stat -p $oid >p && ".
                 "git patch-id --stable <p" ];
         my $xenv = { GIT_DIR => $git->{git_dir} };
         my $tmp = File::Temp->newdir("show-$oid-XXXX", TMPDIR => 1);