[FIXED JENKINS-6203] force UTF-8 when reading change log

according to https://www.kernel.org/pub/software/scm/git/docs/git-log.html, git CLI uses UTF-8 by default to produce change log entries, so no impact on git-client.
jenkinsci · Mar 12, 2013 · cdf149a · cdf149a · oleg-nenashev · Nov 16, 2013
1 parent 18e7998
commit cdf149a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/git/GitChangeLogParser.java b/src/main/java/hudson/plugins/git/GitChangeLogParser.java
@@ -6,8 +6,11 @@
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -32,7 +35,7 @@ public GitChangeSetList parse(AbstractBuild build, File changelogFile)
 
         // Parse the log file into GitChangeSet items - each one is a commit
 
-        BufferedReader rdr = new BufferedReader(new FileReader(changelogFile));
+        BufferedReader rdr = new BufferedReader(new InputStreamReader(new FileInputStream(changelogFile), Charset.forName("UTF-8")));
 
         try {
             String line;

diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/src/main/java/hudson/plugins/git/GitSCM.java
@@ -1288,7 +1288,7 @@ private void checkout(GitClient git, ObjectId commit, /* @Nullable */ String bra
     private void computeChangeLog(GitClient git, Revision revToBuild, BuildListener listener, BuildData buildData, FilePath changelogFile, BuildChooserContext context) throws IOException, InterruptedException {
         int histories = 0;
 
-        PrintStream out = new PrintStream(changelogFile.write());
+        PrintStream out = new PrintStream(changelogFile.write(), false, "UTF-8");
         try {
             for (Branch b : revToBuild.getBranches()) {
                 Build lastRevWas = buildChooser.prevBuildForChangelog(b.getName(), buildData, git, context);
@@ -1323,7 +1323,7 @@ private void computeMergeChangeLog(GitClient git, Revision revToBuild, String re
         } else {
             int histories = 0;
 
-            PrintStream out = new PrintStream(changelogFile.write());
+            PrintStream out = new PrintStream(changelogFile.write(), false, "UTF-8");
             try {
                 for (Branch b : revToBuild.getBranches()) {
                     putChangelogDiffs(git, b.getName(), remoteBranch, revToBuild.getSha1().name(), out);