diff options
| author | Patrick Steinhardt <ps@pks.im> | 2025-07-01 14:22:29 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-01 14:46:39 -0700 |
| commit | 841a03b4046ab81276743b4d7e727b1658f805da (patch) | |
| tree | 326a295d6e22f5c1d3dc8d8b46e74b33c7302d17 /builtin/grep.c | |
| parent | 08218b8cd4b54468bbb7cd09454a630ca4209d1a (diff) | |
| download | git-841a03b4046ab81276743b4d7e727b1658f805da.tar.gz | |
odb: rename `read_object_with_reference()`
Rename `read_object_with_reference()` to `odb_read_object_peeled()` to
match other functions related to the object database and our modern
coding guidelines. Furthermore though, the old name didn't really
describe very well what this function actually does, which is to walk
down any commit and tag objects until an object of the required type has
been found. This is generally referred to as "peeling", so the new name
should be way more descriptive.
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>
Diffstat (limited to 'builtin/grep.c')
| -rw-r--r-- | builtin/grep.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 5de61dfffe..39273d9c0f 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -522,9 +522,7 @@ static int grep_submodule(struct grep_opt *opt, obj_read_lock(); object_type = odb_read_object_info(subrepo->objects, oid, NULL); obj_read_unlock(); - data = read_object_with_reference(subrepo, - oid, OBJ_TREE, - &size, NULL); + data = odb_read_object_peeled(subrepo->objects, oid, OBJ_TREE, &size, NULL); if (!data) die(_("unable to read tree (%s)"), oid_to_hex(oid)); @@ -705,9 +703,8 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec, struct strbuf base; int hit, len; - data = read_object_with_reference(opt->repo, - &obj->oid, OBJ_TREE, - &size, NULL); + data = odb_read_object_peeled(opt->repo->objects, &obj->oid, + OBJ_TREE, &size, NULL); if (!data) die(_("unable to read tree (%s)"), oid_to_hex(&obj->oid)); |