diff options
| -rw-r--r-- | graph.c | 2 | ||||
| -rwxr-xr-x | t/t4202-log.sh | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 46bd24f502..67f983fea4 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 |