178179180181182183184
* objects are missing or multiple merge bases were found. */ protected AbstractTreeIterator mergeBase(final int aIdx, final int bIdx) throws IOException { RevCommit base = getBaseCommit(aIdx, bIdx); return (base == null) ? new EmptyTreeIterator() : openTree(base.getTree()); }
252253254255256257258259260
} } private void addTree(TreeWalk tw, ObjectId id) throws MissingObjectException, IncorrectObjectTypeException, IOException { if (id == null) tw.addTree(new EmptyTreeIterator()); else tw.addTree(id); }
255256257258259260261262263264265
treeWalk.setRecursive(true); // add the trees (tree, dirchache, workdir) if (tree != null) treeWalk.addTree(tree); else treeWalk.addTree(new EmptyTreeIterator()); treeWalk.addTree(new DirCacheIterator(dirCache)); treeWalk.addTree(initialWorkingTreeIterator); Collection<TreeFilter> filters = new ArrayList<TreeFilter>(4); if (monitor != null) {
248249250251252253254255256
175176177178179180181
253254255256257258259260261
135136137138139140141
@Override public EmptyTreeIterator createEmptyTreeIterator() { final byte[] n = new byte[Math.max(pathLen + 1, DEFAULT_PATH_SIZE)]; System.arraycopy(path, 0, n, 0, pathLen); n[pathLen] = '/'; return new EmptyTreeIterator(this, n, pathLen + 1); }
251252253254255256257258259260261