Skip to content

Commit fea996b

Browse files
committed
Remove byte order masks when constructing variation trees
1 parent caa6dfc commit fea996b

2 files changed

Lines changed: 14 additions & 5 deletions

File tree

pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,12 @@
131131
<version>3.12.0</version>
132132
</dependency>
133133

134+
<dependency>
135+
<groupId>commons-io</groupId>
136+
<artifactId>commons-io</artifactId>
137+
<version>2.12.0</version>
138+
</dependency>
139+
134140
<dependency>
135141
<groupId>org.tinylog</groupId>
136142
<artifactId>tinylog-api</artifactId>

src/main/java/org/variantsync/diffdetective/validation/ConstructionValidation.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import java.util.Set;
1313
import java.util.function.BiConsumer;
1414

15+
import org.apache.commons.io.input.CharacterFilterReader;
1516
import org.apache.commons.lang3.NotImplementedException;
1617
import org.eclipse.jgit.revwalk.RevCommit;
1718
import org.tinylog.Logger;
@@ -350,11 +351,13 @@ private void counts(DiffTree tree, DiffTreeStatistics statistics) {
350351

351352
private DiffTree parseVariationTree(Analysis analysis, RevCommit commit) throws IOException, DiffParseException {
352353
try (BufferedReader afterFile =
353-
GitDiffer.getBeforeFullFile(
354-
analysis.getRepository().getGitRepo().run(),
355-
commit,
356-
analysis.getCurrentPatch().getFileName()
357-
)
354+
new BufferedReader(
355+
new CharacterFilterReader(
356+
GitDiffer.getBeforeFullFile(
357+
analysis.getRepository().getGitRepo().run(),
358+
commit,
359+
analysis.getCurrentPatch().getFileName()),
360+
0xfeff)) // BOM, same as GitDiffer.BOM_PATTERN
358361
) {
359362
return DiffTreeParser.createVariationTree(afterFile, analysis.getRepository().getParseOptions().diffTreeParseOptions());
360363
}

0 commit comments

Comments
 (0)