зеркало из https://github.com/microsoft/git.git
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
This commit is contained in:
Коммит
46992b5411
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;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче