opendev/gerrit
Code Issues Proposed changes

MergeUtil: Pass Charset directly to MergeFormatter.formatMerge

Browse Source 
Since [1] the variant of #formatMerge that takes the charset name as
a String is deprecated in favor of a new one that takes a Charset.

[1] https://git.eclipse.org/r/#/c/130188/

Change-Id: Idcb8982fdfa4939ebf60951fd5031fd9cc47cb0f
This commit is contained in:
David Pursehouse
2018-12-13 14:38:13 +09:00
parent 0f758d82d9
commit 6c62bf7944
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/server/git/MergeUtil.java
View File

@@ -348,7 +348,7 @@ public class MergeUtil {
for (Map.Entry<String, MergeResult<? extends Sequence>> entry : mergeResults.entrySet()) {
MergeResult<? extends Sequence> p = entry.getValue();
try (TemporaryBuffer buf = new TemporaryBuffer.LocalFile(null, 10 * 1024 * 1024)) {
fmt.formatMerge(buf, p, "BASE", oursNameFormatted, theirsNameFormatted, UTF_8.name());
fmt.formatMerge(buf, p, "BASE", oursNameFormatted, theirsNameFormatted, UTF_8);
buf.close();
try (InputStream in = buf.openInputStream()) {