From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Nov 2013 22:37:11 +0000 (-0800)
Subject: Merge branch 'hn/log-graph-color-octopus' into maint
X-Git-Tag: v1.8.4.3~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/46992b5411508b3b1a77d3178440efa77774a367?hp=07c55c00a56ced7dac32206dbaebbb06bf129a37

Merge branch 'hn/log-graph-color-octopus' into maint

Coloring around octopus merges in "log --graph" output was screwy.

* hn/log-graph-color-octopus:
graph: fix coloring around octopus merges
---

diff --git a/graph.c b/graph.c
index b24d04c406..640433166b 100644
--- a/graph.c
+++ b/graph.c
@@ -801,10 +801,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;
+		col_num = (i / 2) + dashless_commits + graph->commit_index;
 		strbuf_write_column(sb, &graph->new_columns[col_num], '-');
 	}
-	col_num = (i / 2) + dashless_commits;
+	col_num = (i / 2) + dashless_commits + graph->commit_index;
 	strbuf_write_column(sb, &graph->new_columns[col_num], '.');
 	return num_dashes + 1;
 }