Patch Set 1:

This patch is totally untested, but I think it does what I was proposing on the mailing list... have the WorkingTreeIterator use data from the DirCacheIterator, so that TreeFilter.ANY_DIFF can compare with idEqual() and not trigger a scan of the contents.