diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java index dd6717b6d..89a8846bc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java @@ -689,9 +689,8 @@ private boolean processMerge(Candidate n) throws IOException { revPool.parseHeaders(parent); if (!find(parent, n.sourcePath)) continue; - if (!(n instanceof ReverseCandidate) && idBuf.equals(n.sourceBlob)) { + if (!(n instanceof ReverseCandidate) && idBuf.equals(n.sourceBlob)) return blameEntireRegionOnParent(n, parent); - } if (ids == null) ids = new ObjectId[pCnt]; ids[pIdx] = idBuf.toObjectId();