Merge branch 'ds/reachable-final-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Oct 2018 07:16:04 +0000 (16:16 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Oct 2018 07:16:04 +0000 (16:16 +0900)
Code already in 'master' is further cleaned-up by this patch.

* ds/reachable-final-cleanup:
commit-reach: cleanups in can_all_from_reach...

1  2 
commit-reach.c
diff --combined commit-reach.c
index 00e5ceee6fc8c33dad6071862ee7fe7923f3aa33,66aa41262c5e34b6f5c6cc02ca1f85a51e9fff58..67e1792b5c0f5d4d83794348941b66f77874f1ee
@@@ -39,9 -39,6 +39,9 @@@ static struct commit_list *paint_down_t
        int i;
        uint32_t last_gen = GENERATION_NUMBER_INFINITY;
  
 +      if (!min_generation)
 +              queue.compare = compare_commits_by_commit_date;
 +
        one->object.flags |= PARENT1;
        if (!n) {
                commit_list_append(one, &result);
@@@ -59,7 -56,7 +59,7 @@@
                struct commit_list *parents;
                int flags;
  
 -              if (commit->generation > last_gen)
 +              if (min_generation && commit->generation > last_gen)
                        BUG("bad generation skip %8x > %8x at %s",
                            commit->generation, last_gen,
                            oid_to_hex(&commit->object.oid));
@@@ -561,7 -558,8 +561,8 @@@ int can_all_from_reach_with_flag(struc
                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.
        }
  
  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++)