Skip to content

Commit bdc81d1

Browse files
committed
Merge branch 'ds/topo-traversal-using-commit-graph'
Prepare use of reachability index in topological walker that works on a range (A..B). * ds/topo-traversal-using-commit-graph: revision: keep topo-walk free of unintersting commits revision: use generation for A..B --topo-order queries
2 parents 2f47531 + 1d8e31a commit bdc81d1

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

revision.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,9 @@ static struct commit *handle_commit(struct rev_info *revs,
436436
die("unable to parse commit %s", name);
437437
if (flags & UNINTERESTING) {
438438
mark_parents_uninteresting(commit);
439-
revs->limited = 1;
439+
440+
if (!revs->topo_order || !generation_numbers_enabled(the_repository))
441+
revs->limited = 1;
440442
}
441443
if (revs->sources) {
442444
char **slot = revision_sources_at(revs->sources, commit);
@@ -3263,6 +3265,9 @@ static void expand_topo_walk(struct rev_info *revs, struct commit *commit)
32633265
struct commit *parent = p->item;
32643266
int *pi;
32653267

3268+
if (parent->object.flags & UNINTERESTING)
3269+
continue;
3270+
32663271
if (parse_commit_gently(parent, 1) < 0)
32673272
continue;
32683273

0 commit comments

Comments
 (0)