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:
parent
10a62e1176
commit
ade8af729c
|
@ -308,6 +308,8 @@ static DiffEntry pair(ChangeType changeType, DiffEntry src, DiffEntry dst,
|
||||||
r.changeType = changeType;
|
r.changeType = changeType;
|
||||||
r.score = score;
|
r.score = score;
|
||||||
|
|
||||||
|
r.treeFilterMarks = src.treeFilterMarks | dst.treeFilterMarks;
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue