diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-10-30 12:10:21 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-10-30 12:10:21 -0700 |
commit | 779503c5eb5fe822409cdf7c064a818bdc650f02 (patch) | |
tree | 0ef387f1e66ddfbe4bde85b2dbdaa4281c24ee86 | |
parent | f101b888f278ca6ceaeef11fbee72c29e6dd9237 (diff) | |
parent | 339c17bc7690b5436ac61c996cede3d52c85b50d (diff) | |
download | git-779503c5eb5fe822409cdf7c064a818bdc650f02.tar.gz |
Merge branch 'hn/log-graph-color-octopus'
* hn/log-graph-color-octopus:
graph: fix coloring around octopus merges
-rw-r--r-- | graph.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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; } |