diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-10 10:08:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-10 10:08:39 -0700 |
| commit | fdbfac60fd889d4e55244958ce7febd61cb53f9d (patch) | |
| tree | 15bcae02645159c8e370021238e85eeb1f7bbfea | |
| parent | d194e61ea7be1d09534eebf53eb878c37e3361f8 (diff) | |
| parent | 51b27747e5ba939942fe0e1f9a61e86e0ead19ed (diff) | |
| download | git-fdbfac60fd889d4e55244958ce7febd61cb53f9d.tar.gz | |
Merge branch 'jk/fsck-on-diet'
"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
| -rw-r--r-- | builtin/fsck.c | 6 | ||||
| -rw-r--r-- | object.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c index f7916f06ed..41acbc229e 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -228,6 +228,8 @@ static void mark_unreachable_referents(const struct object_id *oid) options.walk = mark_used; 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, @@ -437,9 +439,6 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size) out: if (obj->type == OBJ_TREE) free_tree_buffer((struct tree *)obj); - if (obj->type == OBJ_COMMIT) - free_commit_buffer(the_repository->parsed_objects, - (struct commit *)obj); return err; } @@ -853,6 +852,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) errors_found = 0; read_replace_refs = 0; + save_commit_buffer = 0; argc = parse_options(argc, argv, prefix, fsck_opts, fsck_usage, 0); @@ -233,7 +233,8 @@ struct object *parse_object_buffer(struct repository *r, const struct object_id if (commit) { if (parse_commit_buffer(r, commit, buffer, size, 1)) 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); *eaten_p = 1; } |