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

gitster · gitster · commit 46992b541150 · 2013-11-07T14:37:11.000-08:00
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
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -801,10 +801,10 @@ static int graph_draw_octopus_merge(struct git_graph *graph,`
`801`	`801`	`int num_dashes =`
`802`	`802`	`((graph->num_parents - dashless_commits) * 2) - 1;`
`803`	`803`	`for (i = 0; i < num_dashes; i++) {`
`804`		`- col_num = (i / 2) + dashless_commits;`
	`804`	`+ col_num = (i / 2) + dashless_commits + graph->commit_index;`
`805`	`805`	`strbuf_write_column(sb, &graph->new_columns[col_num], '-');`
`806`	`806`	`}`
`807`		`- col_num = (i / 2) + dashless_commits;`
	`807`	`+ col_num = (i / 2) + dashless_commits + graph->commit_index;`
`808`	`808`	`strbuf_write_column(sb, &graph->new_columns[col_num], '.');`
`809`	`809`	`return num_dashes + 1;`
`810`	`810`	`}`