Преглед изворни кода

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
tags/v3.0.0.201305281830-rc2
Robin Stocker пре 11 година
родитељ
комит
ade8af729c
1 измењених фајлова са 2 додато и 0 уклоњено
  1. 2
    0
      org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffEntry.java

+ 2
- 0
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;
}


Loading…
Откажи
Сачувај