From: "Øystein Walle" <oystwa@gmail.com>
To: git@vger.kernel.org
Cc: derrickstolee@github.com, "Øystein Walle" <oystwa@gmail.com>
Subject: [PATCH] revision: Don't queue uninteresting commits
Date: Wed, 11 Oct 2023 14:35:34 +0200 [thread overview]
Message-ID: <20231011123534.119994-1-oystwa@gmail.com> (raw)
Currently all given commits are added to the topo_queue during
init_topo_walk(). Later on in get_revision_1() the uninteresting ones
are skipped because simplify_commit() tells it to.
Let's not add them to the topo_queue in the first place.
Signed-off-by: Øystein Walle <oystwa@gmail.com>
---
I noticed this while trying to understand the generation based algorithm
introduced in b45424181e (revision.c: generation-based topo-order
algorithm, 2018-11-01) in an attempt to write a similar one for
gitoxide. Comparing my solution to git's output I fixed a mismatch by
essentially doing this, and it turns out it works in git too. I am not
extremely confident, but all the tests pass...
For fun I also tried removing the UNINTERESTING check from
get_commit_action() altogether but then a lot of tests fail. I expected
that because both the flag and function predate the new algorithm.
revision.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/revision.c b/revision.c
index 2f4c53ea20..deeab813c7 100644
--- a/revision.c
+++ b/revision.c
@@ -3681,7 +3681,8 @@ static void init_topo_walk(struct rev_info *revs)
for (list = revs->commits; list; list = list->next) {
struct commit *c = list->item;
- if (*(indegree_slab_at(&info->indegree, c)) == 1)
+ if (*(indegree_slab_at(&info->indegree, c)) == 1 &&
+ !(c->object.flags & UNINTERESTING))
prio_queue_put(&info->topo_queue, c);
}
--
2.34.1
next reply other threads:[~2023-10-11 12:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-11 12:35 Øystein Walle [this message]
2023-10-11 16:40 ` [PATCH] revision: Don't queue uninteresting commits Junio C Hamano
2023-11-06 11:28 ` Øystein Walle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231011123534.119994-1-oystwa@gmail.com \
--to=oystwa@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).