Merge "Accept UTF8 BOM with BlobBasedConfig"

9 years ago · fcd796a9a0
1 changed files with 9 additions and 1 deletions
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BlobBasedConfig.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BlobBasedConfig.java
@ -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);
 	}

 	/**