summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorKevin Sawicki2011-09-01 16:29:43 (EDT)
committer Kevin Sawicki2011-09-01 16:29:43 (EDT)
commitd110fbc300fe32b00a491e6471d5534f4615b87b (patch)
tree0de15985fc0e665961bd6e2fd1e32dcf3cad551f
parentdf117d3da924e5b505475f582df788c076c8c1c1 (diff)
downloadjgit-d110fbc300fe32b00a491e6471d5534f4615b87b.zip
jgit-d110fbc300fe32b00a491e6471d5534f4615b87b.tar.gz
jgit-d110fbc300fe32b00a491e6471d5534f4615b87b.tar.bz2
[blame] Reset rename detector before computing renames.refs/changes/18/4118/1
Bug: 354507 Change-Id: I5e9c65a082d9dee1e87536c5cf2a8de75efa6a33 Signed-off-by: Kevin Sawicki <kevin@github.com>
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java1
1 files changed, 1 insertions, 0 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 3b8e41e..5157364 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java
@@ -945,6 +945,7 @@ public class BlameGenerator {
treeWalk.setFilter(TreeFilter.ANY_DIFF);
treeWalk.reset(parent.getTree(), commit.getTree());
+ renameDetector.reset();
renameDetector.addAll(DiffEntry.scan(treeWalk));
for (DiffEntry ent : renameDetector.compute()) {
if (isRename(ent) && ent.getNewPath().equals(path.getPath()))