Only stop recursing into a nested git repository if it actually is
a submodule.
This allows adding nested git repositories as files as usual.
Signed-off-by: Lukas Straub <lukasstraub2@xxxxxx>
---
dir.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/dir.c b/dir.c
index a959885f50..359015748f 100644
--- a/dir.c
+++ b/dir.c
@@ -1787,10 +1787,8 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
if ((dir->flags & DIR_SKIP_NESTED_GIT) ||
!(dir->flags & DIR_NO_GITLINKS)) {
- struct strbuf sb = STRBUF_INIT;
- strbuf_addstr(&sb, dirname);
- nested_repo = is_nonbare_repository_dir(&sb);
- strbuf_release(&sb);
+ nested_repo = !!submodule_from_path(the_repository, &null_oid,
+ dirname);
}
if (nested_repo)
return ((dir->flags & DIR_SKIP_NESTED_GIT) ? path_none :
--
2.28.0.217.ge805fe7219
Attachment:
pgpE8UO_6Bl4S.pgp
Description: OpenPGP digital signature
