unpack-trees: avoid duplicate ODB lookups during checkout