From 83b0cc7623cd58a8065730653d8fa6cc5dce2374 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 10 Oct 2016 13:39:38 +0300 Subject: [PATCH] IDEA-56814 git: fix encoding issues in annotations * We use same encoding to parse file content and git meta information. After a7c864a we no longer use file content, so this hack is no longer required. * This fixes parse error on files in UTF-16 * This fixes parsing of non-ascii names --- .../git4idea/src/git4idea/annotate/GitAnnotationProvider.java | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java b/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java index cab13d9f1a05..d913a8ae23b0 100644 --- a/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java +++ b/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java @@ -155,7 +155,6 @@ public class GitAnnotationProvider implements AnnotationProviderEx { VirtualFile root = GitUtil.getGitRoot(repositoryFilePath); GitSimpleHandler h = new GitSimpleHandler(myProject, root, GitCommand.BLAME); h.setStdoutSuppressed(true); - h.setCharset(file.getCharset()); h.addParameters("--porcelain", "-l", "-t", "-w"); if (revision == null) { h.addParameters("HEAD");