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:
9
tag.c
9
tag.c
@ -54,15 +54,15 @@ int gpg_verify_tag(const struct object_id *oid, const char *name_to_report,
|
||||
return error("%s: cannot verify a non-tag object of type %s.",
|
||||
name_to_report ?
|
||||
name_to_report :
|
||||
find_unique_abbrev(oid, DEFAULT_ABBREV),
|
||||
repo_find_unique_abbrev(the_repository, oid, DEFAULT_ABBREV),
|
||||
type_name(type));
|
||||
|
||||
buf = read_object_file(oid, &type, &size);
|
||||
buf = repo_read_object_file(the_repository, oid, &type, &size);
|
||||
if (!buf)
|
||||
return error("%s: unable to read file.",
|
||||
name_to_report ?
|
||||
name_to_report :
|
||||
find_unique_abbrev(oid, DEFAULT_ABBREV));
|
||||
repo_find_unique_abbrev(the_repository, oid, DEFAULT_ABBREV));
|
||||
|
||||
ret = run_gpg_verify(buf, size, flags);
|
||||
|
||||
@ -219,7 +219,8 @@ int parse_tag(struct tag *item)
|
||||
|
||||
if (item->object.parsed)
|
||||
return 0;
|
||||
data = read_object_file(&item->object.oid, &type, &size);
|
||||
data = repo_read_object_file(the_repository, &item->object.oid, &type,
|
||||
&size);
|
||||
if (!data)
|
||||
return error("Could not read %s",
|
||||
oid_to_hex(&item->object.oid));
|
||||
|
Reference in New Issue
Block a user