kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

submodule-config: remove uses of `the_repository` 

Several functions in the submodule-config subsystem implicitly depend
on `the_repository`. Refactor these to take a `struct repository` as
parameter and adapt callers accordingly.

Note that as usual with these refactorings, callers simply pass
`the_repository` even if they already have a different repository
available in the calling context. This simplifies the migration and
ensures that we don't have a change in behaviour.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
jch^2
Patrick Steinhardt 2026-09-01 13:09:01 +02:00 committed by Junio C Hamano
parent 895156bb99
commit a776b844d6
7 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/fetch.c
View File

@ -2681,7 +2681,7 @@ int cmd_fetch(int argc,
int *rs = config.recurse_submodules == RECURSE_SUBMODULES_DEFAULT
? &config.recurse_submodules : NULL;

fetch_config_from_gitmodules(sfjc, rs);
fetch_config_from_gitmodules(the_repository, sfjc, rs);
}



2
builtin/grep.c
View File

@ -897,7 +897,7 @@ static int grep_objects(struct grep_opt *opt, const struct pathspec *pathspec,
if (recurse_submodules) {
submodule_free(opt->repo);
obj_read_lock();
gitmodules_config_oid(&real_obj->oid);
gitmodules_config_oid(the_repository, &real_obj->oid);
obj_read_unlock();
}
if (grep_object(opt, pathspec, real_obj, list->objects[i].name,

8
builtin/submodule--helper.c
View File

@ -3041,7 +3041,7 @@ static int module_update(int argc, const char **argv, const char *prefix,
NULL
};

update_clone_config_from_gitmodules(&opt.max_jobs);
update_clone_config_from_gitmodules(the_repository, &opt.max_jobs);
repo_config(the_repository, git_update_clone_config, &opt.max_jobs);

argc = parse_options(argc, argv, prefix, module_update_options,
@ -3255,7 +3255,7 @@ static int module_set_url(int argc, const char **argv, const char *prefix,
path);

config_name = xstrfmt("submodule.%s.url", sub->name);
ret = config_set_in_gitmodules_file_gently(config_name, newurl);
ret = config_set_in_gitmodules_file_gently(the_repository, config_name, newurl);

if (!ret) {
repo_read_gitmodules(the_repository, 0);
@ -3311,7 +3311,7 @@ static int module_set_branch(int argc, const char **argv, const char *prefix,
path);

config_name = xstrfmt("submodule.%s.branch", sub->name);
ret = config_set_in_gitmodules_file_gently(config_name, opt_branch);
ret = config_set_in_gitmodules_file_gently(the_repository, config_name, opt_branch);

free(config_name);
return !!ret;
@ -3510,7 +3510,7 @@ static int config_submodule_in_gitmodules(const char *name, const char *var, con
die(_("please make sure that the .gitmodules file is in the working tree"));

key = xstrfmt("submodule.%s.%s", name, var);
ret = config_set_in_gitmodules_file_gently(key, value);
ret = config_set_in_gitmodules_file_gently(the_repository, key, value);
free(key);

return ret;

49
submodule-config.c
View File

@ -667,19 +667,20 @@ static int parse_config(const char *var, const char *value,
return ret;
}

static int gitmodule_oid_from_commit(const struct object_id *treeish_name,
static int gitmodule_oid_from_commit(struct repository *repo,
const struct object_id *treeish_name,
struct object_id *gitmodules_oid,
struct strbuf *rev)
{
int ret = 0;

if (is_null_oid(treeish_name)) {
oidclr(gitmodules_oid, the_repository->hash_algo);
oidclr(gitmodules_oid, repo->hash_algo);
return 1;
}

strbuf_addf(rev, "%s:.gitmodules", oid_to_hex(treeish_name));
if (repo_get_oid(the_repository, rev->buf, gitmodules_oid) >= 0)
if (repo_get_oid(repo, rev->buf, gitmodules_oid) >= 0)
ret = 1;

return ret;
@ -689,9 +690,11 @@ static int gitmodule_oid_from_commit(const struct object_id *treeish_name,
* (key) with on-demand reading of the appropriate .gitmodules from
* revisions.
*/
static const struct submodule *config_from(struct submodule_cache *cache,
const struct object_id *treeish_name, const char *key,
enum lookup_type lookup_type)
static const struct submodule *config_from(struct repository *repo,
struct submodule_cache *cache,
const struct object_id *treeish_name,
const char *key,
enum lookup_type lookup_type)
{
struct strbuf rev = STRBUF_INIT;
size_t config_size;
@ -718,7 +721,7 @@ static const struct submodule *config_from(struct submodule_cache *cache,
return entry->config;
}

if (!gitmodule_oid_from_commit(treeish_name, &oid, &rev))
if (!gitmodule_oid_from_commit(repo, treeish_name, &oid, &rev))
goto out;

switch (lookup_type) {
@ -732,7 +735,7 @@ static const struct submodule *config_from(struct submodule_cache *cache,
if (submodule)
goto out;

config = odb_read_object(the_repository->objects, &oid,
config = odb_read_object(repo->objects, &oid,
&type, &config_size);
if (!config || type != OBJ_BLOB)
goto out;
@ -843,21 +846,22 @@ void repo_read_gitmodules(struct repository *repo, int skip_if_read)
repo->submodule_cache->gitmodules_read = 1;
}

void gitmodules_config_oid(const struct object_id *commit_oid)
void gitmodules_config_oid(struct repository *repo,
const struct object_id *commit_oid)
{
struct strbuf rev = STRBUF_INIT;
struct object_id oid;

submodule_cache_check_init(the_repository);
submodule_cache_check_init(repo);

if (gitmodule_oid_from_commit(commit_oid, &oid, &rev)) {
if (gitmodule_oid_from_commit(repo, commit_oid, &oid, &rev)) {
git_config_from_blob_oid(gitmodules_cb, rev.buf,
the_repository, &oid, the_repository,
repo, &oid, repo,
CONFIG_SCOPE_UNKNOWN);
}
strbuf_release(&rev);

the_repository->submodule_cache->gitmodules_read = 1;
repo->submodule_cache->gitmodules_read = 1;
}

const struct submodule *submodule_from_name(struct repository *r,
@ -865,7 +869,7 @@ const struct submodule *submodule_from_name(struct repository *r,
const char *name)
{
repo_read_gitmodules(r, 1);
return config_from(r->submodule_cache, treeish_name, name, lookup_name);
return config_from(r, r->submodule_cache, treeish_name, name, lookup_name);
}

const struct submodule *submodule_from_path(struct repository *r,
@ -873,7 +877,7 @@ const struct submodule *submodule_from_path(struct repository *r,
const char *path)
{
repo_read_gitmodules(r, 1);
return config_from(r->submodule_cache, treeish_name, path, lookup_path);
return config_from(r, r->submodule_cache, treeish_name, path, lookup_path);
}

/**
@ -980,11 +984,12 @@ 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 config_set_in_gitmodules_file_gently(struct repository *repo,
const char *key, const char *value)
{
int ret;

ret = repo_config_set_in_file_gently(the_repository, GITMODULES_FILE, key, NULL, value);
ret = repo_config_set_in_file_gently(repo, GITMODULES_FILE, key, NULL, value);
if (ret < 0)
/* Maybe the user already did that, don't error out here */
warning(_("Could not update .gitmodules entry %s"), key);
@ -1017,13 +1022,15 @@ static int gitmodules_fetch_config(const char *var, const char *value,
return 0;
}

void fetch_config_from_gitmodules(int *max_children, int *recurse_submodules)
void fetch_config_from_gitmodules(struct repository *repo,
int *max_children,
int *recurse_submodules)
{
struct fetch_config config = {
.max_children = max_children,
.recurse_submodules = recurse_submodules
};
config_from_gitmodules(gitmodules_fetch_config, the_repository, &config);
config_from_gitmodules(gitmodules_fetch_config, repo, &config);
}

static int gitmodules_update_clone_config(const char *var, const char *value,
@ -1036,7 +1043,7 @@ static int gitmodules_update_clone_config(const char *var, const char *value,
return 0;
}

void update_clone_config_from_gitmodules(int *max_jobs)
void update_clone_config_from_gitmodules(struct repository *repo, int *max_jobs)
{
config_from_gitmodules(gitmodules_update_clone_config, the_repository, max_jobs);
config_from_gitmodules(gitmodules_update_clone_config, repo, max_jobs);
}

12
submodule-config.h
View File

@ -57,7 +57,8 @@ int option_fetch_parse_recurse_submodules(const struct option *opt,
int parse_update_recurse_submodules_arg(const char *opt, const char *arg);
int parse_push_recurse_submodules_arg(const char *opt, const char *arg);
void repo_read_gitmodules(struct repository *repo, int skip_if_read);
void gitmodules_config_oid(const struct object_id *commit_oid);
void gitmodules_config_oid(struct repository *repo,
const struct object_id *commit_oid);

/**
* Same as submodule_from_path but lookup by name.
@ -80,7 +81,8 @@ const struct submodule *submodule_from_path(struct repository *r,
void submodule_free(struct repository *r);

int print_config_from_gitmodules(struct repository *repo, const char *key);
int config_set_in_gitmodules_file_gently(const char *key, const char *value);
int config_set_in_gitmodules_file_gently(struct repository *repo,
const char *key, const char *value);

/*
* Returns 0 if the name is syntactically acceptable as a submodule "name"
@ -100,8 +102,10 @@ int check_submodule_url(const char *url);
* New helpers to retrieve arbitrary configuration from the '.gitmodules' file
* should NOT be added.
*/
void fetch_config_from_gitmodules(int *max_children, int *recurse_submodules);
void update_clone_config_from_gitmodules(int *max_jobs);
void fetch_config_from_gitmodules(struct repository *repo,
int *max_children,
int *recurse_submodules);
void update_clone_config_from_gitmodules(struct repository *repo, int *max_jobs);

/*
* Submodule entry that contains relevant information about a

2
submodule.c
View File

@ -133,7 +133,7 @@ int update_path_in_gitmodules(const char *oldpath, const char *newpath)
strbuf_addstr(&entry, "submodule.");
strbuf_addstr(&entry, submodule->name);
strbuf_addstr(&entry, ".path");
ret = config_set_in_gitmodules_file_gently(entry.buf, newpath);
ret = config_set_in_gitmodules_file_gently(the_repository, entry.buf, newpath);
strbuf_release(&entry);
return ret;
}

4
t/helper/test-submodule.c
View File

@ -168,7 +168,7 @@ static int cmd__submodule_config_set(int argc, const char **argv)
if (!is_writing_gitmodules_ok())
die("please make sure that the .gitmodules file is in the working tree");

return config_set_in_gitmodules_file_gently(argv[1], argv[2]);
return config_set_in_gitmodules_file_gently(the_repository, argv[1], argv[2]);
}
usage_with_options(usage, options);
}
@ -188,7 +188,7 @@ static int cmd__submodule_config_unset(int argc, const char **argv)
if (argc == 2) {
if (!is_writing_gitmodules_ok())
die("please make sure that the .gitmodules file is in the working tree");
return config_set_in_gitmodules_file_gently(argv[1], NULL);
return config_set_in_gitmodules_file_gently(the_repository, argv[1], NULL);
}
usage_with_options(usage, options);
}