Subject: [PATCH 3/3] graph API: fix a bug in the rendering of octopus merges

From: Allan Caffee <[email-masked]>
Date: Wed, 22 Apr 2009 17:27:59 -0400

An off by one error was causing octopus merges with 3 parents to not be
rendered correctly.  This regression was introduced by 427fc5.

Signed-off-by: Allan Caffee <[email-masked]>
---
 graph.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/graph.c b/graph.c
index 31e09eb..b7879f8 100644
--- a/graph.c
+++ b/graph.c
@@ -852,7 +852,7 @@ static void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb)
 			graph_output_commit_char(graph, sb);
 			chars_written++;
 
-			if (graph->num_parents > 3)
+			if (graph->num_parents > 2)
 				chars_written += graph_draw_octopus_merge(graph,
 									  sb);
 		} else if (seen_this && (graph->num_parents > 2)) {
-- 
1.5.6.3