diff options
| author |  Jonathan Tan <jonathantanmy@google.com> | 2018-06-07 12:04:14 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-06-21 12:22:48 -0700 |
| commit | f3c23db2d7e764b247f7d76a8d0ba180811e9525 (patch) | |
| tree | da2cc54ff72aadae315b6a324678bbc9828c1763 /builtin | |
| parent | pack-bitmap: remove bitmap_git global variable (diff) | |
| download | tgif-f3c23db2d7e764b247f7d76a8d0ba180811e9525.tar.xz | |
pack-bitmap: add free function
Add a function to free struct bitmap_index instances, and use it where
needed (except when rebuild_existing_bitmaps() is used, since it creates
references to the bitmaps within the struct bitmap_index passed to it).
Note that the hashes field in struct bitmap_index is not freed because
it points to another field within the same struct. The documentation for
that field has been updated to clarify that.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pack-objects.c | 1 | ||||
| -rw-r--r-- | builtin/rev-list.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index d064f944b0..896e413007 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2945,6 +2945,7 @@ static int get_object_list_from_bitmap(struct rev_info *revs) } traverse_bitmap_commit_list(bitmap_git, &add_object_entry_from_bitmap); + free_bitmap_index(bitmap_git); return 0; } diff --git a/builtin/rev-list.c b/builtin/rev-list.c index cce42ae1dd..62776721f3 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -521,6 +521,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) if (max_count >= 0 && max_count < commit_count) commit_count = max_count; printf("%d\n", commit_count); + free_bitmap_index(bitmap_git); return 0; } } else if (revs.max_count < 0 && @@ -528,6 +529,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) struct bitmap_index *bitmap_git; if ((bitmap_git = prepare_bitmap_walk(&revs))) { traverse_bitmap_commit_list(bitmap_git, &show_object_fast); + free_bitmap_index(bitmap_git); return 0; } } |