diff --git a/plugins/git4idea/src/git4idea/log/GitBekParentFixer.java b/plugins/git4idea/src/git4idea/log/GitBekParentFixer.java index 94d47f13bbb1..614a156faeba 100644 --- a/plugins/git4idea/src/git4idea/log/GitBekParentFixer.java +++ b/plugins/git4idea/src/git4idea/log/GitBekParentFixer.java @@ -31,10 +31,10 @@ class GitBekParentFixer { @NotNull private static final String MAGIC_TEXT = "Merge remote"; @NotNull private static final VcsLogFilterCollection MAGIC_FILTER = createVcsLogFilterCollection(); - @NotNull private final Set myWrongCommits; + @NotNull private final Set myIncorrectCommits; - private GitBekParentFixer(@NotNull Set wrongCommits) { - myWrongCommits = wrongCommits; + private GitBekParentFixer(@NotNull Set incorrectCommits) { + myIncorrectCommits = incorrectCommits; } @NotNull @@ -42,25 +42,25 @@ class GitBekParentFixer { if (!BekUtil.isBekEnabled()) { return new GitBekParentFixer(Collections.emptySet()); } - return new GitBekParentFixer(getWrongCommits(provider, root)); + return new GitBekParentFixer(getIncorrectCommits(provider, root)); } @NotNull TimedVcsCommit fixCommit(@NotNull TimedVcsCommit commit) { - if (!myWrongCommits.contains(commit.getId())) { + if (!myIncorrectCommits.contains(commit.getId())) { return commit; } return reverseParents(commit); } @NotNull - private static Set getWrongCommits(@NotNull GitLogProvider provider, @NotNull VirtualFile root) throws VcsException { + private static Set getIncorrectCommits(@NotNull GitLogProvider provider, @NotNull VirtualFile root) throws VcsException { List commitsMatchingFilter = provider.getCommitsMatchingFilter(root, MAGIC_FILTER, -1); return ContainerUtil.map2Set(commitsMatchingFilter, timedVcsCommit -> timedVcsCommit.getId()); } @NotNull - private static TimedVcsCommit reverseParents(@NotNull final TimedVcsCommit commit) { + private static TimedVcsCommit reverseParents(@NotNull TimedVcsCommit commit) { return new TimedVcsCommit() { @Override public long getTimestamp() {