X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/375650cf691b46f7c45b47791eb654d98d115a1a..987890af2eaf079310ad4f15539089bf7f924d7a:/tig.c

diff --git a/tig.c b/tig.c
index cc3dc50..d1d63da 100644
--- a/tig.c
+++ b/tig.c
@@ -2813,14 +2813,6 @@ graph_parent_is_merge(struct rev_stack *graph)
 	return graph->parents->size > 1;
 }
 
-static void
-reset_rev_graph(struct rev_stack *graph)
-{
-	graph->size = graph->pos = 0;
-	graph->commit = NULL;
-	memset(graph->parents, 0, sizeof(*graph->parents));
-}
-
 static inline void
 append_to_rev_graph(struct rev_stack *stack, chtype symbol)
 {
@@ -2829,6 +2821,27 @@ append_to_rev_graph(struct rev_stack *stack, chtype symbol)
 }
 
 static void
+done_rev_graph(struct rev_stack *graph)
+{
+	if (graph_parent_is_merge(graph) &&
+	    graph->pos < graph->size - 1 &&
+	    graph->next->size == graph->size + graph->parents->size - 1) {
+		size_t i = graph->pos + graph->parents->size - 1;
+
+		graph->commit->graph_size = i * 2;
+		while (i < graph->next->size - 1) {
+			append_to_rev_graph(graph, ' ');
+			append_to_rev_graph(graph, '\\');
+			i++;
+		}
+	}
+
+	graph->size = graph->pos = 0;
+	graph->commit = NULL;
+	memset(graph->parents, 0, sizeof(*graph->parents));
+}
+
+static void
 push_rev_stack(struct rev_stack *stack, char *parent)
 {
 	/* Combine duplicate parents lines. */
@@ -2924,22 +2937,7 @@ update_rev_graph(struct rev_stack *graph)
 		push_rev_stack(graph->next, graph->rev[i]);
 
 	draw_rev_graph(graph);
-
-	graph = graph->prev;
-
-	if (graph_parent_is_merge(graph) &&
-	    graph->pos < graph->size - 1 &&
-	    graph->next->size == graph->size + graph->parents->size - 1) {
-		i = graph->pos + graph->parents->size - 1;
-		graph->commit->graph_size = i * 2;
-		while (i < graph->next->size - 1) {
-			append_to_rev_graph(graph, ' ');
-			append_to_rev_graph(graph, '\\');
-			i++;
-		}
-	}
-
-	reset_rev_graph(graph);
+	done_rev_graph(graph->prev);
 }
 
 /* Reads git log --pretty=raw output and parses it into the commit struct. */