Also use unpack_trees() in do_diff_cache()