combine-diff: convert diff_tree_combined to struct object_id