X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-trees.c;h=c29a9e067ff362063d6626e8e4d1e4466d63b8af;hb=678e484b7d4e6388edeec3470bbbcd206817c148;hp=75f54cac97f62ddaad736c2cd582cc6cdeaaebfa;hpb=c512b035556eff4d8f869afeda5fd78bc7a4966d;p=git.git

diff --git a/unpack-trees.c b/unpack-trees.c
index 75f54cac9..c29a9e067 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -67,16 +67,8 @@ static void unlink_entry(struct cache_entry *ce)
 {
 	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));
 }