diff options
| author | Robin Stocker <robin@nibor.org> | 2013-05-19 15:19:35 +0200 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2013-05-24 11:32:31 -0400 |
| commit | ade8af729ce5c30d3c89124893b7fefbce954f08 (patch) | |
| tree | c0840aa35cefd731670883d97fe40bad4de6e801 | |
| parent | 10a62e11763043bafa0b10a36628173c3d6c382e (diff) | |
| download | jgit-ade8af729ce5c30d3c89124893b7fefbce954f08.tar.gz jgit-ade8af729ce5c30d3c89124893b7fefbce954f08.zip | |
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
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffEntry.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffEntry.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffEntry.java index a3d4e09d70..06b2aec06b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffEntry.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffEntry.java @@ -308,6 +308,8 @@ public class DiffEntry { r.changeType = changeType; r.score = score; + r.treeFilterMarks = src.treeFilterMarks | dst.treeFilterMarks; + return r; } |