From: Allan Caffee Date: Wed, 22 Apr 2009 21:27:59 +0000 (-0400) Subject: graph API: fix a bug in the rendering of octopus merges X-Git-Tag: v1.6.3-rc2~22 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a6c1a3827c934872726bafb35f51f2ad9b9e897f;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/graph.c b/graph.c index 31e09eb2c..b7879f8c6 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)) { diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 46bd24f50..67f983fea 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -342,7 +342,7 @@ cat > expect <<\EOF * initial EOF -test_expect_failure 'log --graph with merge' ' +test_expect_sucess 'log --graph with merge' ' git log --graph --date-order --pretty=tformat:%s | sed "s/ *$//" >actual && test_cmp expect actual