[PATCH] Don't recurse into parents marked uninteresting.
From: Matthias Urlichs <hidden>
Date: 2016-06-15 22:42:21
Subsystem:
the rest · Maintainer:
Linus Torvalds
revision.c:make_parents_uninteresting() is exponential with the number of merges in the tree. That's fine -- unless some other part of git already has pulled the whole commit tree into memory ... --- ... or, in other words, "Don't do that, please." With this patch, all tests still succeed, and the "git push" which triggered the problem takes 5min instead of an estimated 10mio years. --- revision.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) 32c9750691d1ef225ca1641fdf6902e53c25fe5b
diff --git a/revision.c b/revision.c
index 2a33637..713f27e 100644
--- a/revision.c
+++ b/revision.c@@ -82,18 +82,20 @@ void mark_parents_uninteresting(struct c while (parents) { struct commit *commit = parents->item; - commit->object.flags |= UNINTERESTING; + if (!(commit->object.flags & UNINTERESTING)) { + commit->object.flags |= UNINTERESTING; - /* - * Normally we haven't parsed the parent - * yet, so we won't have a parent of a parent - * here. However, it may turn out that we've - * reached this commit some other way (where it - * wasn't uninteresting), in which case we need - * to mark its parents recursively too.. - */ - if (commit->parents) - mark_parents_uninteresting(commit); + /* + * Normally we haven't parsed the parent + * yet, so we won't have a parent of a parent + * here. However, it may turn out that we've + * reached this commit some other way (where it + * wasn't uninteresting), in which case we need + * to mark its parents recursively too.. + */ + if (commit->parents) + mark_parents_uninteresting(commit); + } /* * A missing commit is ok iff its parent is marked
--
Matthias Urlichs