summaryrefslogtreecommitdiff
path: root/submodule.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-08-03 18:19:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-03 20:11:01 (GMT)
commit1b796ace7b5566d7cd2ed2ee56d3e5b1f7605272 (patch)
treef42ceacf4c2ffd03a6beeb2513684a7efc936a77 /submodule.c
parent32bc548329d20d33fb25973d76440eccd260c433 (diff)
downloadgit-1b796ace7b5566d7cd2ed2ee56d3e5b1f7605272.zip
git-1b796ace7b5566d7cd2ed2ee56d3e5b1f7605272.tar.gz
git-1b796ace7b5566d7cd2ed2ee56d3e5b1f7605272.tar.bz2
submodule-config: move submodule-config functions to submodule-config.c
Migrate the functions used to initialize the submodule-config to submodule-config.c so that the callback routine used in the initialization process can be static and prevent it from being used outside of initializing the submodule-config through the main API. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.c')
-rw-r--r--submodule.c35
1 files changed, 0 insertions, 35 deletions
diff --git a/submodule.c b/submodule.c
index 3b383d8..c1cef1c 100644
--- a/submodule.c
+++ b/submodule.c
@@ -216,46 +216,11 @@ void load_submodule_cache(void)
gitmodules_config();
}
-static int gitmodules_cb(const char *var, const char *value, void *data)
-{
- struct repository *repo = data;
- return submodule_config_option(repo, var, value);
-}
-
-void repo_read_gitmodules(struct repository *repo)
-{
- if (repo->worktree) {
- char *gitmodules;
-
- if (repo_read_index(repo) < 0)
- return;
-
- gitmodules = repo_worktree_path(repo, GITMODULES_FILE);
-
- if (!is_gitmodules_unmerged(repo->index))
- git_config_from_file(gitmodules_cb, gitmodules, repo);
-
- free(gitmodules);
- }
-}
-
void gitmodules_config(void)
{
repo_read_gitmodules(the_repository);
}
-void gitmodules_config_oid(const struct object_id *commit_oid)
-{
- struct strbuf rev = STRBUF_INIT;
- struct object_id oid;
-
- if (gitmodule_oid_from_commit(commit_oid, &oid, &rev)) {
- git_config_from_blob_oid(gitmodules_cb, rev.buf,
- &oid, the_repository);
- }
- strbuf_release(&rev);
-}
-
/*
* Determine if a submodule has been initialized at a given 'path'
*/