averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

odb: rename pretend_object_file()

Browse Source 
Rename `pretend_object_file()` to `odb_pretend_object()` to match other
functions related to the object database and our modern coding
guidelines.

No compatibility wrapper is introduced as the function is not used a lot
throughout our codebase.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2025-07-01 14:22:28 +02:00
committed by Junio C Hamano
parent fcf8e3e111
commit 08218b8cd4
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
blame.c
View File

@@ -277,7 +277,8 @@ static struct commit *fake_working_tree_commit(struct repository *r,
convert_to_git(r->index, path, buf.buf, buf.len, &buf, 0); convert_to_git(r->index, path, buf.buf, buf.len, &buf, 0);
origin->file.ptr = buf.buf; origin->file.ptr = buf.buf;
origin->file.size = buf.len; origin->file.size = buf.len;
pretend_object_file(the_repository, buf.buf, buf.len, OBJ_BLOB, &origin->blob_oid); odb_pretend_object(the_repository->objects, buf.buf, buf.len,
OBJ_BLOB, &origin->blob_oid);
/* /*
* Read the current index, replace the path entry with * Read the current index, replace the path entry with

18
odb.c
View File

@@ -863,21 +863,21 @@ int odb_read_object_info(struct object_database *odb,
return type; return type;
} }
int pretend_object_file(struct repository *repo, int odb_pretend_object(struct object_database *odb,
void *buf, unsigned long len, enum object_type type, void *buf, unsigned long len, enum object_type type,
struct object_id *oid) struct object_id *oid)
{ {
struct cached_object_entry *co; struct cached_object_entry *co;
char *co_buf; char *co_buf;
hash_object_file(repo->hash_algo, buf, len, type, oid); hash_object_file(odb->repo->hash_algo, buf, len, type, oid);
if (odb_has_object(repo->objects, oid, 0) || if (odb_has_object(odb, oid, 0) ||
find_cached_object(repo->objects, oid)) find_cached_object(odb, oid))
return 0; return 0;
ALLOC_GROW(repo->objects->cached_objects, ALLOC_GROW(odb->cached_objects,
repo->objects->cached_object_nr + 1, repo->objects->cached_object_alloc); odb->cached_object_nr + 1, odb->cached_object_alloc);
co = &repo->objects->cached_objects[repo->objects->cached_object_nr++]; co = &odb->cached_objects[odb->cached_object_nr++];
co->value.size = len; co->value.size = len;
co->value.type = type; co->value.type = type;
co_buf = xmalloc(len); co_buf = xmalloc(len);

6
odb.h
View File

@@ -282,9 +282,9 @@ void *odb_read_object(struct object_database *odb,
* object in persistent storage before writing any other new objects * object in persistent storage before writing any other new objects
* that reference it. * that reference it.
*/ */
int pretend_object_file(struct repository *repo, int odb_pretend_object(struct object_database *odb,
void *buf, unsigned long len, enum object_type type, void *buf, unsigned long len, enum object_type type,
struct object_id *oid); struct object_id *oid);
struct object_info { struct object_info {
/* Request */ /* Request */