mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'hn/log-graph-color-octopus'
* hn/log-graph-color-octopus: graph: fix coloring around octopus merges
This commit is contained in:
commit
779503c5eb
4
graph.c
4
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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue