[PATCH 10/12] git rm: do not abort due to an initialised submodule
From: Peter Collingbourne <hidden>
Date: 2016-06-15 22:48:30
Subsystem:
the rest · Maintainer:
Linus Torvalds
This patch causes the "git rm" command to consider "directory not empty" errors as nonfatal, which will be caused by a submodule being in an initialised state. As this is a normal state for a submodule, it should not cause us to abort. Neither should we recursively delete the submodule directory as it may contain unsaved data. Signed-off-by: Peter Collingbourne <redacted> --- builtin/rm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/builtin/rm.c b/builtin/rm.c
index 6ac5114..02ee259 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c@@ -250,7 +250,9 @@ int cmd_rm(int argc, const char **argv, const char *prefix) * abort the "git rm" (but once we've successfully removed * any file at all, we'll go ahead and commit to it all: * by then we've already committed ourselves and can't fail - * in the middle) + * in the middle). However failure to remove a submodule + * directory due to the submodule being initialised is never + * a fatal condition. */ if (!index_only) { int removed = 0;
@@ -261,7 +263,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix) removed = 1; continue; } - if (!removed) + if (!removed && errno != EEXIST && errno != ENOTEMPTY) die_errno("git rm: '%s'", path); else warning("git rm: '%s': %s", path, strerror(errno));
--
1.6.5