t/helper: add test-submodule-nested-repo-config

diff --git a/submodule-config.c b/submodule-config.c
index 5aaf7ac00ed34deed969fdee0c12dbc2e2749988..6869394c32fcede018701a4f6af1da0bffb2c105 100644 (file)
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "dir.h"
 #include "repository.h"
 #include "config.h"
 #include "submodule-config.h"
@@ -603,8 +604,34 @@ static void submodule_cache_check_init(struct repository *repo)
 static void config_from_gitmodules(config_fn_t fn, struct repository *repo, void *data)
 {
        if (repo->worktree) {
-               char *file = repo_worktree_path(repo, GITMODULES_FILE);
-               git_config_from_file(fn, file, data);
+               struct git_config_source config_source = { 0 };
+               const struct config_options opts = { 0 };
+               struct object_id oid;
+               char *file;
+
+               file = repo_worktree_path(repo, GITMODULES_FILE);
+               if (file_exists(file)) {
+                       config_source.file = file;
+               } else if (repo->submodule_prefix) {
+                       /*
+                        * When get_oid and config_with_options, used below,
+                        * become able to work on a specific repository, this
+                        * warning branch can be removed.
+                        */
+                       warning("nested submodules without %s in the working tree are not supported yet",
+                               GITMODULES_FILE);
+                       goto out;
+               } else if (get_oid(GITMODULES_INDEX, &oid) >= 0) {
+                       config_source.blob = GITMODULES_INDEX;
+               } else if (get_oid(GITMODULES_HEAD, &oid) >= 0) {
+                       config_source.blob = GITMODULES_HEAD;
+               } else {
+                       goto out;
+               }
+
+               config_with_options(fn, data, &config_source, &opts);
+
+out:
                free(file);
        }
 }
@@ -707,6 +734,18 @@ int print_config_from_gitmodules(struct repository *repo, const char *key)
        return 0;
 }
 
+int config_set_in_gitmodules_file_gently(const char *key, const char *value)
+{
+       int ret;
+
+       ret = git_config_set_in_file_gently(GITMODULES_FILE, key, value);
+       if (ret < 0)
+               /* Maybe the user already did that, don't error out here */
+               warning(_("Could not update .gitmodules entry %s"), key);
+
+       return ret;
+}
+
 struct fetch_config {
        int *max_children;
        int *recurse_submodules;