[findBugs] Use UTF-8 to read git-rebase-todo file
Change-Id: I7c6f71e13ef106678157eae1aa3f9d39712e577b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
parent
0aa1a19cab
commit
f1dd61f646
|
@ -43,6 +43,8 @@
|
|||
|
||||
package org.eclipse.jgit.lib;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
|
||||
import java.io.BufferedOutputStream;
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
|
@ -177,8 +179,8 @@ private static RebaseTodoLine parseLine(byte[] buf, int tokenBegin,
|
|||
while (tokenCount < 3 && nextSpace < lineEnd) {
|
||||
switch (tokenCount) {
|
||||
case 0:
|
||||
String actionToken = new String(buf, tokenBegin, nextSpace
|
||||
- tokenBegin - 1);
|
||||
String actionToken = new String(buf, tokenBegin,
|
||||
nextSpace - tokenBegin - 1, UTF_8);
|
||||
tokenBegin = nextSpace;
|
||||
action = RebaseTodoLine.Action.parse(actionToken);
|
||||
if (action == null)
|
||||
|
@ -186,14 +188,14 @@ private static RebaseTodoLine parseLine(byte[] buf, int tokenBegin,
|
|||
break;
|
||||
case 1:
|
||||
nextSpace = RawParseUtils.next(buf, tokenBegin, ' ');
|
||||
String commitToken = new String(buf, tokenBegin, nextSpace
|
||||
- tokenBegin - 1);
|
||||
String commitToken = new String(buf, tokenBegin,
|
||||
nextSpace - tokenBegin - 1, UTF_8);
|
||||
tokenBegin = nextSpace;
|
||||
commit = AbbreviatedObjectId.fromString(commitToken);
|
||||
break;
|
||||
case 2:
|
||||
return new RebaseTodoLine(action, commit, RawParseUtils.decode(
|
||||
buf, tokenBegin, 1 + lineEnd));
|
||||
return new RebaseTodoLine(action, commit,
|
||||
RawParseUtils.decode(buf, tokenBegin, 1 + lineEnd));
|
||||
}
|
||||
tokenCount++;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue