[PATCH 6/8] bundle: use leak_pending flag
- From
René Scharfe <rene.scharfe@lsrfire.ath.cx>
- Date
- Oct 1, 2011, 16:02 UTC
- Message-ID
- <4E87399C.5010700@lsrfire.ath.cx>
- In-Reply-To
- <4E8731AF.2040305@lsrfire.ath.cx>
Instead of creating a copy of the list of pending objects, copy the struct object_array that points to it, turn on leak_pending, and thus cause prepare_revision_walk to leave it to us. And free it once we're done.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> --- bundle.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/bundle.c b/bundle.c index f48fd7d..26cc9ab 100644 --- a/bundle.c +++ b/bundle.c @@ -122,11 +122,8 @@ int verify_bundle(struct bundle_header *header, int verbose) req_nr = revs.pending.nr; setup_revisions(2, argv, &revs, NULL); - memset(&refs, 0, sizeof(struct object_array)); - for (i = 0; i < revs.pending.nr; i++) { - struct object_array_entry *e = revs.pending.objects + i; - add_object_array(e->item, e->name, &refs); - } + refs = revs.pending; + revs.leak_pending = 1; if (prepare_revision_walk(&revs)) die("revision walk setup failed"); @@ -146,6 +143,7 @@ int verify_bundle(struct bundle_header *header, int verbose) for (i = 0; i < refs.nr; i++) clear_commit_marks((struct commit *)refs.objects[i].item, -1); + free(refs.objects); if (verbose) { struct ref_list *r;
-- 1.7.7