mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/fsck-on-diet' into maint-2.38

Browse Source 
"git fsck" failed to release contents of tree objects already used
from the memory, which has been fixed.

* jk/fsck-on-diet:
  parse_object_buffer(): respect save_commit_buffer
  fsck: turn off save_commit_buffer
  fsck: free tree buffers after walking unreachable objects
This commit is contained in:
Junio C Hamano
2022-10-25 17:11:33 -07:00
parent 1655ac884a 51b27747e5
commit cf96b393d6
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/fsck.c
View File

@ -228,6 +228,8 @@ static void mark_unreachable_referents(const struct object_id *oid)
options.walk = mark_used; options.walk = mark_used;
fsck_walk(obj, NULL, &options); fsck_walk(obj, NULL, &options);
if (obj->type == OBJ_TREE)
free_tree_buffer((struct tree *)obj);
} }
static int mark_loose_unreachable_referents(const struct object_id *oid, static int mark_loose_unreachable_referents(const struct object_id *oid,
@ -437,9 +439,6 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size)
out: out:
if (obj->type == OBJ_TREE) if (obj->type == OBJ_TREE)
free_tree_buffer((struct tree *)obj); free_tree_buffer((struct tree *)obj);
if (obj->type == OBJ_COMMIT)
free_commit_buffer(the_repository->parsed_objects,
(struct commit *)obj);
return err; return err;
} }
@ -853,6 +852,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
errors_found = 0; errors_found = 0;
read_replace_refs = 0; read_replace_refs = 0;
save_commit_buffer = 0;
argc = parse_options(argc, argv, prefix, fsck_opts, fsck_usage, 0); argc = parse_options(argc, argv, prefix, fsck_opts, fsck_usage, 0);

3
object.c
View File

@ -233,7 +233,8 @@ struct object *parse_object_buffer(struct repository *r, const struct object_id
if (commit) { if (commit) {
if (parse_commit_buffer(r, commit, buffer, size, 1)) if (parse_commit_buffer(r, commit, buffer, size, 1))
return NULL; return NULL;
if (!get_cached_commit_buffer(r, commit, NULL)) { if (save_commit_buffer &&
!get_cached_commit_buffer(r, commit, NULL)) {
set_commit_buffer(r, commit, buffer, size); set_commit_buffer(r, commit, buffer, size);
*eaten_p = 1; *eaten_p = 1;
} }