motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Accept UTF8 BOM with BlobBasedConfig"

This commit is contained in:
Shawn Pearce 2015-12-15 23:12:54 -05:00 committed by Gerrit Code Review @ Eclipse.org
parent 6297c2e92c 618b0c1ceb
commit fcd796a9a0
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
org.eclipse.jgit/src/org/eclipse/jgit/lib/BlobBasedConfig.java
View File

@ -79,7 +79,15 @@ public class BlobBasedConfig extends Config {
public BlobBasedConfig(Config base, final byte[] blob)
throws ConfigInvalidException {
super(base);
fromText(RawParseUtils.decode(blob));
final String decoded;
if (blob.length >= 3 && blob[0] == (byte) 0xEF
&& blob[1] == (byte) 0xBB && blob[2] == (byte) 0xBF) {
decoded = RawParseUtils.decode(RawParseUtils.UTF8_CHARSET,
blob, 3, blob.length);
} else {
decoded = RawParseUtils.decode(blob);
}
fromText(decoded);
}
/**