kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

* hn/log-graph-color-octopus:
  graph: fix coloring around octopus merges
maint
Junio C Hamano 2013-10-30 12:10:21 -07:00
parent f101b888f2 339c17bc76
commit 779503c5eb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graph.c
View File

@ -801,10 +801,10 @@ static int graph_draw_octopus_merge(struct git_graph *graph,
int num_dashes = int num_dashes =
((graph->num_parents - dashless_commits) * 2) - 1; ((graph->num_parents - dashless_commits) * 2) - 1;
for (i = 0; i < num_dashes; i++) { 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], '-'); 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], '.'); strbuf_write_column(sb, &graph->new_columns[col_num], '.');
return num_dashes + 1; return num_dashes + 1;
} }