kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

builtin/fsck: use `fsck_obj_buffer()` when checking loose objects 

When checking loose objects we manually parse the object buffer we have
read from the on-disk file, mark the object and then call `fsck_obj()`.
The exact same steps are also performed by `fsck_obj_buffer()`.

Stop open-coding this logic and call `fsck_obj_buffer()` instead.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
jch
Patrick Steinhardt 2026-08-31 08:46:15 +02:00 committed by Junio C Hamano
parent 3db2defe2f
commit 68c869769e
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/fsck.c
View File

@ -722,7 +722,6 @@ static int fsck_loose(const struct object_id *oid, const char *path,
void *cb_data)
{
struct for_each_loose_cb *data = cb_data;
struct object *obj;
enum object_type type = OBJ_NONE;
size_t size;
void *contents = NULL;
@ -751,21 +750,7 @@ static int fsck_loose(const struct object_id *oid, const char *path,
if (!contents && type != OBJ_BLOB)
BUG("read_loose_object streamed a non-blob");

obj = parse_object_buffer(data->repo, oid, type, size,
contents, &eaten);

if (!obj) {
errors_found |= ERROR_OBJECT;
error(_("%s: object could not be parsed: %s"),
oid_to_hex(oid), path);
if (!eaten)
free(contents);
return 0; /* keep checking other objects */
}

obj->flags &= ~(REACHABLE | SEEN);
obj->flags |= HAS_OBJ;
if (fsck_obj(data->repo, obj, contents, size))
if (fsck_obj_buffer(oid, type, size, contents, &eaten, data->repo))
errors_found |= ERROR_OBJECT;

if (!eaten)