diff options
-rw-r--r-- | org.eclipse.jgit.test/exttst/org/eclipse/jgit/ignore/CGitVsJGitRandomIgnorePatternTest.java | 2 | ||||
-rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameResult.java | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/org.eclipse.jgit.test/exttst/org/eclipse/jgit/ignore/CGitVsJGitRandomIgnorePatternTest.java b/org.eclipse.jgit.test/exttst/org/eclipse/jgit/ignore/CGitVsJGitRandomIgnorePatternTest.java index 23a267c8dc..47a410bdee 100644 --- a/org.eclipse.jgit.test/exttst/org/eclipse/jgit/ignore/CGitVsJGitRandomIgnorePatternTest.java +++ b/org.eclipse.jgit.test/exttst/org/eclipse/jgit/ignore/CGitVsJGitRandomIgnorePatternTest.java @@ -164,7 +164,7 @@ public class CGitVsJGitRandomIgnorePatternTest { private String readProcessStream(InputStream processStream) throws IOException { try (BufferedReader stdOut = new BufferedReader( - new InputStreamReader(processStream))) { + new InputStreamReader(processStream, UTF_8))) { StringBuilder out = new StringBuilder(); String s; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameResult.java index 48f6b7e250..5e2746cc7c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameResult.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameResult.java @@ -79,7 +79,6 @@ public class BlameResult { BlameResult(BlameGenerator bg, String path, RawText text) { generator = bg; - generator.setUseCache(false); resultPath = path; resultContents = text; |