commit 6bc669522a10be711d65bd8138ca7451773313d7 from: Stefan Sperling date: Wed Sep 19 13:09:35 2018 UTC fix commit graph iteration again; second entry was omitted commit - 028d7a4e4c3fbee17ba819b80451fae7636c1ed0 commit + 6bc669522a10be711d65bd8138ca7451773313d7 blob - 58b872fd9b4a151a1ff40b597af8a9412d9f5b3b blob + 036dcb769e6665167524a622b0d806c0586fc644 --- lib/commit_graph.c +++ lib/commit_graph.c @@ -721,24 +721,15 @@ got_commit_graph_iter_next(struct got_object_id **id, TAILQ_LAST(&graph->iter_list, got_commit_graph_iter_list) && got_object_idset_num_elements(graph->open_branches) == 0) { /* We are done iterating. */ - if (graph->iter_node == TAILQ_FIRST(&graph->iter_list)) - *id = &graph->iter_node->id; - else - *id = NULL; + *id = &graph->iter_node->id; graph->iter_node = NULL; - return *id ? NULL : got_error(GOT_ERR_ITER_COMPLETED); + return NULL; } if (TAILQ_NEXT(graph->iter_node, entry) == NULL) return got_error(GOT_ERR_ITER_NEED_MORE); - if (graph->iter_node == TAILQ_FIRST(&graph->iter_list)) { - *id = &graph->iter_node->id; - graph->iter_node = TAILQ_NEXT(graph->iter_node, entry); - } else { - graph->iter_node = TAILQ_NEXT(graph->iter_node, entry); - *id = &graph->iter_node->id; - } - + *id = &graph->iter_node->id; + graph->iter_node = TAILQ_NEXT(graph->iter_node, entry); return NULL; }