]> git.ipfire.org Git - thirdparty/git.git/commitdiff
revision: keep topo-walk free of unintersting commits
authorDerrick Stolee <stolee@gmail.com>
Tue, 21 May 2019 13:59:53 +0000 (09:59 -0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 May 2019 17:39:49 +0000 (10:39 -0700)
When updating the topo-order walk in b454241 (revision.c: generation-based
topo-order algorithm, 2018-11-01), the logic was a huge rewrite of the
walk logic. In that massive change, we accidentally included the
UNINTERESTING commits in expand_topo_walk(). This means that a simple
query like

    git rev-list --topo-order HEAD~1..HEAD

will expand the topo walk for all commits reachable from HEAD, and not
just one commit.

This change should speed up these cases, but there is still a need
for corrected commit-date for some A..B queries.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
revision.c

index be6ccf57861dda611dbf99efd1d0c8890537ca21..621feb9df716400f32d016e1d36fc368b6a884fb 100644 (file)
@@ -3265,6 +3265,9 @@ static void expand_topo_walk(struct rev_info *revs, struct commit *commit)
                struct commit *parent = p->item;
                int *pi;
 
+               if (parent->object.flags & UNINTERESTING)
+                       continue;
+
                if (parse_commit_gently(parent, 1) < 0)
                        continue;