diff --git a/unpack-trees.c b/unpack-trees.c
index 75f54cac97f62ddaad736c2cd582cc6cdeaaebfa..c29a9e067ff362063d6626e8e4d1e4466d63b8af 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
{
if (has_symlink_or_noent_leading_path(ce->name, ce_namelen(ce)))
return;
- if (S_ISGITLINK(ce->ce_mode)) {
- if (rmdir(ce->name)) {
- warning("unable to rmdir %s: %s",
- ce->name, strerror(errno));
- return;
- }
- }
- else
- if (unlink_or_warn(ce->name))
- return;
+ if (remove_or_warn(ce->ce_mode, ce->name))
+ return;
schedule_dir_for_removal(ce->name, ce_namelen(ce));
}