summaryrefslogtreecommitdiff
path: root/graph.c
diff options
context:
space:
mode:
authorAllan Caffee <allan.caffee@gmail.com>2009-04-22 21:27:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-23 00:49:56 (GMT)
commita6c1a3827c934872726bafb35f51f2ad9b9e897f (patch)
tree3a0f601dcec66d00cbacfc1848b42ca75ad0c4be /graph.c
parent36a31feae23ac45a130fa38b2934a74e4e7156b4 (diff)
downloadgit-a6c1a3827c934872726bafb35f51f2ad9b9e897f.zip
git-a6c1a3827c934872726bafb35f51f2ad9b9e897f.tar.gz
git-a6c1a3827c934872726bafb35f51f2ad9b9e897f.tar.bz2
graph API: fix a bug in the rendering of octopus merges
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 <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'graph.c')
-rw-r--r--graph.c2
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)) {