Commit fe8df4c20ba7f071fe1ce416388a69c241201c69
2018-06-16T23:52:47
undo previous; it broke tog(1) with openssl repo
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
diff --git a/lib/commit_graph.c b/lib/commit_graph.c
index 4ec98d9..958b66e 100644
--- a/lib/commit_graph.c
+++ b/lib/commit_graph.c
@@ -155,6 +155,23 @@ add_node_to_iter_list(struct got_commit_graph *graph,
return;
}
+ /* Ensure that an iteration in progress will see this new commit. */
+ if (graph->iter_node) {
+ n = graph->iter_node;
+ while (n) {
+ next = TAILQ_NEXT(n, entry);
+ if (next &&
+ node->commit_timestamp >= next->commit_timestamp) {
+ TAILQ_INSERT_BEFORE(next, node, entry);
+ return;
+ }
+ n = next;
+ }
+ TAILQ_INSERT_AFTER(&graph->iter_list, graph->iter_node,
+ node, entry);
+ return;
+ }
+
/*
* If a child node is known, begin looping over the list there
* instead of beginning from the list head.
@@ -164,10 +181,6 @@ add_node_to_iter_list(struct got_commit_graph *graph,
/* Insert into list based on committer timestamp. */
do {
if (node->commit_timestamp == n->commit_timestamp) {
- /*
- * Insert after, rather than before, so that an
- * iteration in progress will see this new commit.
- */
TAILQ_INSERT_AFTER(&graph->iter_list, n, node, entry);
break;
} else if (node->commit_timestamp < n->commit_timestamp) {