diff --git a/unpack-trees.c b/unpack-trees.c
index 906ce69ea6daf98cdb4f9dd3d6498264159b6b76..cac2411b9de7b4889abe6b0b84df25d24a38c7e5 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
return;
errno = 0;
}
return;
errno = 0;
}
- if (o->reset) {
- ce->ce_flags |= htons(CE_UPDATE);
- return;
- }
if (errno == ENOENT)
return;
die("Entry '%s' not uptodate. Cannot merge.", ce->name);
if (errno == ENOENT)
return;
die("Entry '%s' not uptodate. Cannot merge.", ce->name);