unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.