From ad40c5986264af1f5934b05082e16a3ce314caab Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Sat, 23 Jun 2018 16:56:43 -0400 Subject: [PATCH v2] log: Fix coloring of certain octupus merge shapes The graph->new_columns index should depend on graph->commit_index. Signed-off-by: Noam Postavsky --- graph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graph.c b/graph.c index e1f6d3bdd..c78259020 100644 --- a/graph.c +++ b/graph.c @@ -857,10 +857,10 @@ static int graph_draw_octopus_merge(struct git_graph *graph, int num_dashes = ((graph->num_parents - dashless_commits) * 2) - 1; for (i = 0; i < num_dashes; i++) { - col_num = (i / 2) + dashless_commits + graph->commit_index; + col_num = (i / 2) + dashless_commits; strbuf_write_column(sb, &graph->new_columns[col_num], '-'); } - col_num = (i / 2) + dashless_commits + graph->commit_index; + col_num = (i / 2) + dashless_commits; strbuf_write_column(sb, &graph->new_columns[col_num], '.'); return num_dashes + 1; } -- 2.11.0