motiejus
/
jgit
1
Fork 0
Code Releases Activity

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
This commit is contained in:
Shawn Pearce 2014-04-20 15:55:32 -07:00
parent 4d840fc6db
commit 2d76133ba2
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java
View File

@ -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;