summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-10-10 17:08:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-10-10 17:08:39 (GMT)
commitfdbfac60fd889d4e55244958ce7febd61cb53f9d (patch)
tree15bcae02645159c8e370021238e85eeb1f7bbfea /object.c
parentd194e61ea7be1d09534eebf53eb878c37e3361f8 (diff)
parent51b27747e5ba939942fe0e1f9a61e86e0ead19ed (diff)
downloadgit-fdbfac60fd889d4e55244958ce7febd61cb53f9d.zip
git-fdbfac60fd889d4e55244958ce7febd61cb53f9d.tar.gz
git-fdbfac60fd889d4e55244958ce7febd61cb53f9d.tar.bz2
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
Diffstat (limited to 'object.c')
-rw-r--r--object.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/object.c b/object.c
index 2e4589b..8a74eb8 100644
--- a/object.c
+++ b/object.c
@@ -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;
}