motiejus
/
jgit
1
Fork 0
Code Releases Activity

Apply tree filter marks when pairing DiffEntry for renames 

When using a RenameDetector to generate new DiffEntries after using
DiffEntry.scan, the treeFilterMarks of the original entries were lost.
Now it combines the marks from src and dst.

See EGit bug 335082 where this is used.

Change-Id: I72b34b10ca12e3a6bd10ce44f4fa05b193fc52cc
This commit is contained in:
Robin Stocker 2013-05-19 15:19:35 +02:00 committed by Gerrit Code Review @ Eclipse.org
parent 10a62e1176
commit ade8af729c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffEntry.java
View File

@ -308,6 +308,8 @@ static DiffEntry pair(ChangeType changeType, DiffEntry src, DiffEntry dst,
r.changeType = changeType;
r.score = score;
r.treeFilterMarks = src.treeFilterMarks | dst.treeFilterMarks;
return r;
}