diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-11-07 14:37:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-07 14:37:11 -0800 |
| commit | 46992b5411508b3b1a77d3178440efa77774a367 (patch) | |
| tree | 158b733e6b48ad060232f26333ac2c66a5c7f2ec | |
| parent | Merge branch 'mm/checkout-auto-track-fix' into maint (diff) | |
| parent | graph: fix coloring around octopus merges (diff) | |
| download | tgif-46992b5411508b3b1a77d3178440efa77774a367.tar.xz | |
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
| -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; } |