From 2d76133ba229135fcc8a9631fe0619456290f34d Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Sun, 20 Apr 2014 15:55:32 -0700 Subject: [PATCH] blame: Reuse existing blameEntireRegionOnParent method Skipping directly to the parent is already possible with an existing helper method. Update the source path (to follow the rename) and then use the existing code path to push the parent inside the current entry. Change-Id: Icb1d49e53d14b599efc478990613625a9e058e09 --- .../src/org/eclipse/jgit/blame/BlameGenerator.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 89a8846bc..ca695d2a8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java @@ -720,10 +720,8 @@ private boolean processMerge(Candidate n) throws IOException { // have an exact content match. For performance reasons // we choose to follow the one parent over trying to do // possibly both parents. - n.sourceCommit = parent; n.setSourcePath(PathFilter.create(r.getOldPath())); - push(n); - return false; + return blameEntireRegionOnParent(n, parent); } renames[pIdx] = r;