X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fapply.c;h=59bbcdb1323cb70432e90ccc2d6a1c60a562c706;hb=81b43b54b2b6cfe917820b26bf206254d8b6738e;hp=f669157b42e658b3769ec775f7aa4dafea634db8;hpb=065a652d6452c84efc8d1fbe8636ab8aeae5348e;p=git.git

diff --git a/builtin/apply.c b/builtin/apply.c
index f669157b4..59bbcdb13 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3141,11 +3141,7 @@ static void remove_file(struct patch *patch, int rmdir_empty)
 			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);
 		}
 	}