bisect: use leak_pending flag

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/bisect.c b/bisect.c
index dd7e8ed69bc0c1268dc3b0a6590501ba9c10d7db..63cf166a6a7c03f785d34c135d04f1480ef4a000 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -823,12 +823,14 @@ static int check_ancestors(const char *prefix)
        bisect_rev_setup(&revs, prefix, "^%s", "%s", 0);
 
        /* Save pending objects, so they can be cleaned up later. */
        bisect_rev_setup(&revs, prefix, "^%s", "%s", 0);
 
        /* Save pending objects, so they can be cleaned up later. */

-       memset(&pending_copy, 0, sizeof(pending_copy));
-       for (i = 0; i < revs.pending.nr; i++)
-               add_object_array(revs.pending.objects[i].item,
-                                revs.pending.objects[i].name,
-                                &pending_copy);
+       pending_copy = revs.pending;
+       revs.leak_pending = 1;

 
 

+       /*
+        * bisect_common calls prepare_revision_walk right away, which
+        * (together with .leak_pending = 1) makes us the sole owner of
+        * the list of pending objects.
+        */

        bisect_common(&revs);
        res = (revs.commits != NULL);
 
        bisect_common(&revs);
        res = (revs.commits != NULL);
 


@@ -837,6 +839,7 @@ static int check_ancestors(const char *prefix)
                struct object *o = pending_copy.objects[i].item;
                clear_commit_marks((struct commit *)o, ALL_REV_FLAGS);
        }
                struct object *o = pending_copy.objects[i].item;
                clear_commit_marks((struct commit *)o, ALL_REV_FLAGS);
        }

+       free(pending_copy.objects);

 
        return res;
 }
 
        return res;
 }