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 /object.c | |
| parent | Merge branch 'so/diff-merges-cleanup' (diff) | |
| parent | parse_object_buffer(): respect save_commit_buffer (diff) | |
| download | git-fdbfac60fd889d4e55244958ce7febd61cb53f9d.tar.gz git-fdbfac60fd889d4e55244958ce7febd61cb53f9d.zip | |
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.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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; } |
