diff options
| author | Shawn Pearce <spearce@spearce.org> | 2014-04-20 15:55:32 -0700 |
|---|---|---|
| committer | Shawn Pearce <spearce@spearce.org> | 2014-04-21 11:43:03 -0700 |
| commit | 2d76133ba229135fcc8a9631fe0619456290f34d (patch) | |
| tree | 9bb8f405de3b16daee333e292c47e24a8aab616a | |
| parent | 4d840fc6db6edf8fc924bdf8191d3c611029e63a (diff) | |
| download | jgit-2d76133ba229135fcc8a9631fe0619456290f34d.tar.gz jgit-2d76133ba229135fcc8a9631fe0619456290f34d.zip | |
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
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java | 4 |
1 files changed, 1 insertions, 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 89a8846bcf..ca695d2a8b 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 @@ public class BlameGenerator { // 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; |