else
tw.setFilter(new NotIgnoredFilter(0));
} else if (gsd.getSrcRevCommit() != null)
tw.addTree(gsd.getSrcRevCommit().getTree());
else
tw.addTree(new EmptyTreeIterator());
// setup base tree
if (gsd.getCommonAncestorRev() != null)
tw.addTree(gsd.getCommonAncestorRev().getTree());
else
tw.addTree(new EmptyTreeIterator());
// setup remote tree
if (gsd.getDstRevCommit() != null)
tw.addTree(gsd.getDstRevCommit().getTree());
else
tw.addTree(new EmptyTreeIterator());
DirCacheIterator dci = null;
if (fti != null) {
dci = new DirCacheIterator(DirCache.read(repo));
tw.addTree(dci);