Currently when a unlink_entry() is called on a submodule, this fails
as remove_or_warn detects it needs to delete a directory via rmdir.
However rmdir only works on empty directories, such that the
"_or_warn" part kicks in, and we get a warning message.
In case the submodule is of no interest we're not going to delete the
submodule, so a warning like that is useful.
If the submodule is interesting then we need to depopulate it properly,
there is no need to react on its return code the depopulation method
handles proper warnings nor do we need to schedule the directory for
removal later, such that we can return early.
Signed-off-by: Stefan Beller <sbel...@google.com>
---
unpack-trees.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 22e32eca96..db03293347 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -214,7 +214,12 @@ static void unlink_entry(const struct cache_entry *ce)
{
if (!check_leading_path(ce->name, ce_namelen(ce)))
return;
- if (remove_or_warn(ce->ce_mode, ce->name))
+
+ if (S_ISGITLINK(ce->ce_mode) &&
+ submodule_is_interesting(ce->name)) {
+ depopulate_submodule(ce->name);
+ return;
+ } else if (remove_or_warn(ce->ce_mode, ce->name))
return;
schedule_dir_for_removal(ce->name, ce_namelen(ce));
}
--
2.11.0.rc2.28.g2673dad
