From: Junio C Hamano Date: Tue, 16 Oct 2018 07:16:04 +0000 (+0900) Subject: Merge branch 'ds/reachable-final-cleanup' X-Git-Tag: v2.20.0-rc0~179 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e366d0c6d04a5c29a8ef49c61bc28209f543f69a?hp=-c Merge branch 'ds/reachable-final-cleanup' Code already in 'master' is further cleaned-up by this patch. * ds/reachable-final-cleanup: commit-reach: cleanups in can_all_from_reach... --- e366d0c6d04a5c29a8ef49c61bc28209f543f69a diff --combined commit-reach.c index 00e5ceee6f,66aa41262c..67e1792b5c --- a/commit-reach.c +++ b/commit-reach.c @@@ -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. @@@ -625,10 -623,7 +626,7 @@@ } 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++)