Merge branch 'jt/avoid-ls-refs'

diff --git a/commit-reach.c b/commit-reach.c
index 00e5ceee6fc8c33dad6071862ee7fe7923f3aa33..9f79ce0a22946174376d247127027e4a0ad3c1e9 100644 (file)
--- a/commit-reach.c
+++ b/commit-reach.c
@@ -426,7 +426,7 @@ struct contains_stack {
 static int in_commit_list(const struct commit_list *want, struct commit *c)
 {
        for (; want; want = want->next)
-               if (!oidcmp(&want->item->object.oid, &c->object.oid))
+               if (oideq(&want->item->object.oid, &c->object.oid))
                        return 1;
        return 0;
 }
@@ -561,7 +561,8 @@ int can_all_from_reach_with_flag(struct object_array *from,
                from_one = deref_tag(the_repository, from_one,
                                     "a from object", 0);
                if (!from_one || from_one->type != OBJ_COMMIT) {
-                       /* no way to tell if this is reachable by
+                       /*
+                        * no way to tell if this is reachable by
                         * looking at the ancestry chain alone, so
                         * leave a note to ourselves not to worry about
                         * this object anymore.
@@ -625,10 +626,7 @@ int can_all_from_reach_with_flag(struct object_array *from,
        }
 
 cleanup:
-       for (i = 0; i < nr_commits; i++) {
-               clear_commit_marks(list[i], RESULT);
-               clear_commit_marks(list[i], assign_flag);
-       }
+       clear_commit_marks_many(nr_commits, list, RESULT | assign_flag);
        free(list);
 
        for (i = 0; i < from->nr; i++)