Use helper function for copying index entry information

[thirdparty/git.git] / unpack-trees.c

diff --git a/unpack-trees.c b/unpack-trees.c
index ec558f9005fab372f9bf62d8c3df9ea34f5222bb..07c4c28a5a0a38a3ae81cccd967ba3117917a513 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -590,7 +590,7 @@ static int merged_entry(struct cache_entry *merge, struct cache_entry *old,
                 * a match.
                 */
                if (same(old, merge)) {
-                       memcpy(merge, old, offsetof(struct cache_entry, name));
+                       copy_cache_entry(merge, old);
                } else {
                        verify_uptodate(old, o);
                        invalidate_ce_path(old);