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:
@ -23,7 +23,8 @@ static int notes_cache_match_validity(struct repository *r,
|
||||
return 0;
|
||||
|
||||
memset(&pretty_ctx, 0, sizeof(pretty_ctx));
|
||||
format_commit_message(commit, "%s", &msg, &pretty_ctx);
|
||||
repo_format_commit_message(r, commit, "%s", &msg,
|
||||
&pretty_ctx);
|
||||
strbuf_trim(&msg);
|
||||
|
||||
ret = !strcmp(msg.buf, validity);
|
||||
@ -81,7 +82,7 @@ char *notes_cache_get(struct notes_cache *c, struct object_id *key_oid,
|
||||
value_oid = get_note(&c->tree, key_oid);
|
||||
if (!value_oid)
|
||||
return NULL;
|
||||
value = read_object_file(value_oid, &type, &size);
|
||||
value = repo_read_object_file(the_repository, value_oid, &type, &size);
|
||||
|
||||
*outsize = size;
|
||||
return value;
|
||||
|
Reference in New Issue
Block a user