diff --git a/builtin/apply.c b/builtin/apply.c
index 771c972c5506db4848e2c214fb617525bafdf335..660cf92538ce125a83d566f3ba2bb7f2c24f5671 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
die("unable to remove %s from index", patch->old_name);
}
if (!cached) {
- if (S_ISGITLINK(patch->old_mode)) {
- if (rmdir(patch->old_name))
- warning("unable to remove submodule %s",
- patch->old_name);
- } else if (!unlink_or_warn(patch->old_name) && rmdir_empty) {
+ if (!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {
remove_path(patch->old_name);
}
}