Commit 1b796ace authored by Brandon Williams's avatar Brandon Williams Committed by Junio C Hamano

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: default avatarBrandon Williams <bmwill@google.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 32bc5483
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "pathspec.h" #include "pathspec.h"
#include "run-command.h" #include "run-command.h"
#include "submodule.h" #include "submodule.h"
#include "submodule-config.h"
static int abbrev; static int abbrev;
static int show_deleted; static int show_deleted;
......
...@@ -449,9 +449,9 @@ static int parse_config(const char *var, const char *value, void *data) ...@@ -449,9 +449,9 @@ static int parse_config(const char *var, const char *value, void *data)
return ret; return ret;
} }
int gitmodule_oid_from_commit(const struct object_id *treeish_name, static int gitmodule_oid_from_commit(const struct object_id *treeish_name,
struct object_id *gitmodules_oid, struct object_id *gitmodules_oid,
struct strbuf *rev) struct strbuf *rev)
{ {
int ret = 0; int ret = 0;
...@@ -552,9 +552,9 @@ static void submodule_cache_check_init(struct repository *repo) ...@@ -552,9 +552,9 @@ static void submodule_cache_check_init(struct repository *repo)
submodule_cache_init(repo->submodule_cache); submodule_cache_init(repo->submodule_cache);
} }
int submodule_config_option(struct repository *repo, static int gitmodules_cb(const char *var, const char *value, void *data)
const char *var, const char *value)
{ {
struct repository *repo = data;
struct parse_config_parameter parameter; struct parse_config_parameter parameter;
submodule_cache_check_init(repo); submodule_cache_check_init(repo);
...@@ -567,9 +567,33 @@ int submodule_config_option(struct repository *repo, ...@@ -567,9 +567,33 @@ int submodule_config_option(struct repository *repo,
return parse_config(var, value, &parameter); return parse_config(var, value, &parameter);
} }
int parse_submodule_config_option(const char *var, const char *value) void repo_read_gitmodules(struct repository *repo)
{ {
return submodule_config_option(the_repository, var, value); 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_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);
} }
const struct submodule *submodule_from_name(const struct object_id *treeish_name, const struct submodule *submodule_from_name(const struct object_id *treeish_name,
......
...@@ -34,8 +34,8 @@ extern int option_fetch_parse_recurse_submodules(const struct option *opt, ...@@ -34,8 +34,8 @@ extern int option_fetch_parse_recurse_submodules(const struct option *opt,
const char *arg, int unset); const char *arg, int unset);
extern int parse_update_recurse_submodules_arg(const char *opt, const char *arg); extern int parse_update_recurse_submodules_arg(const char *opt, const char *arg);
extern int parse_push_recurse_submodules_arg(const char *opt, const char *arg); extern int parse_push_recurse_submodules_arg(const char *opt, const char *arg);
extern int submodule_config_option(struct repository *repo, extern void repo_read_gitmodules(struct repository *repo);
const char *var, const char *value); extern void gitmodules_config_oid(const struct object_id *commit_oid);
extern const struct submodule *submodule_from_name( extern const struct submodule *submodule_from_name(
const struct object_id *commit_or_tree, const char *name); const struct object_id *commit_or_tree, const char *name);
extern const struct submodule *submodule_from_path( extern const struct submodule *submodule_from_path(
...@@ -43,9 +43,6 @@ extern const struct submodule *submodule_from_path( ...@@ -43,9 +43,6 @@ extern const struct submodule *submodule_from_path(
extern const struct submodule *submodule_from_cache(struct repository *repo, extern const struct submodule *submodule_from_cache(struct repository *repo,
const struct object_id *treeish_name, const struct object_id *treeish_name,
const char *key); const char *key);
extern int gitmodule_oid_from_commit(const struct object_id *commit_oid,
struct object_id *gitmodules_oid,
struct strbuf *rev);
extern void submodule_free(void); extern void submodule_free(void);
#endif /* SUBMODULE_CONFIG_H */ #endif /* SUBMODULE_CONFIG_H */
...@@ -216,46 +216,11 @@ void load_submodule_cache(void) ...@@ -216,46 +216,11 @@ void load_submodule_cache(void)
gitmodules_config(); 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) void gitmodules_config(void)
{ {
repo_read_gitmodules(the_repository); 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' * Determine if a submodule has been initialized at a given 'path'
*/ */
......
...@@ -47,8 +47,6 @@ int option_parse_recurse_submodules_worktree_updater(const struct option *opt, ...@@ -47,8 +47,6 @@ int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
const char *arg, int unset); const char *arg, int unset);
void load_submodule_cache(void); void load_submodule_cache(void);
extern void gitmodules_config(void); extern void gitmodules_config(void);
extern void repo_read_gitmodules(struct repository *repo);
extern void gitmodules_config_oid(const struct object_id *commit_oid);
extern int is_submodule_active(struct repository *repo, const char *path); extern int is_submodule_active(struct repository *repo, const char *path);
/* /*
* Determine if a submodule has been populated at a given 'path' by checking if * Determine if a submodule has been populated at a given 'path' by checking if
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment