Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h
* ab/remove-implicit-use-of-the-repository: libs: use "struct repository *" argument, not "the_repository" post-cocci: adjust comments for recent repo_* migration cocci: apply the "revision.h" part of "the_repository.pending" cocci: apply the "rerere.h" part of "the_repository.pending" cocci: apply the "refs.h" part of "the_repository.pending" cocci: apply the "promisor-remote.h" part of "the_repository.pending" cocci: apply the "packfile.h" part of "the_repository.pending" cocci: apply the "pretty.h" part of "the_repository.pending" cocci: apply the "object-store.h" part of "the_repository.pending" cocci: apply the "diff.h" part of "the_repository.pending" cocci: apply the "commit.h" part of "the_repository.pending" cocci: apply the "commit-reach.h" part of "the_repository.pending" cocci: apply the "cache.h" part of "the_repository.pending" cocci: add missing "the_repository" macros to "pending" cocci: sort "the_repository" rules by header cocci: fix incorrect & verbose "the_repository" rules cocci: remove dead rule from "the_repository.pending.cocci"
This commit is contained in:
@ -70,7 +70,7 @@ int is_writing_gitmodules_ok(void)
|
||||
{
|
||||
struct object_id oid;
|
||||
return file_exists(GITMODULES_FILE) ||
|
||||
(get_oid(GITMODULES_INDEX, &oid) < 0 && get_oid(GITMODULES_HEAD, &oid) < 0);
|
||||
(repo_get_oid(the_repository, GITMODULES_INDEX, &oid) < 0 && repo_get_oid(the_repository, GITMODULES_HEAD, &oid) < 0);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -1630,7 +1630,7 @@ get_fetch_task_from_changed(struct submodule_parallel_fetch *spf,
|
||||
if (!task->repo) {
|
||||
strbuf_addf(err, _("Could not access submodule '%s' at commit %s\n"),
|
||||
cs_data->path,
|
||||
find_unique_abbrev(cs_data->super_oid, DEFAULT_ABBREV));
|
||||
repo_find_unique_abbrev(the_repository, cs_data->super_oid, DEFAULT_ABBREV));
|
||||
|
||||
fetch_task_release(task);
|
||||
free(task);
|
||||
@ -1641,8 +1641,8 @@ get_fetch_task_from_changed(struct submodule_parallel_fetch *spf,
|
||||
strbuf_addf(err,
|
||||
_("Fetching submodule %s%s at commit %s\n"),
|
||||
spf->prefix, task->sub->path,
|
||||
find_unique_abbrev(cs_data->super_oid,
|
||||
DEFAULT_ABBREV));
|
||||
repo_find_unique_abbrev(the_repository, cs_data->super_oid,
|
||||
DEFAULT_ABBREV));
|
||||
|
||||
spf->changed_count++;
|
||||
/*
|
||||
|
Reference in New Issue
Block a user