| commit | 339c17bc7690b5436ac61c996cede3d52c85b50d | |
| author | Hemmo Nieminen <hemmo.nieminen@iki.fi> | |
| Wed, 16 Oct 2013 08:28:50 +0000 (16 11:28 +0300) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Oct 2013 19:48:48 +0000 (18 12:48 -0700) | ||
| tree | 3f556a21e2693a3ec95a4104ec2adce6436a7065 | treesnapshot (tar.gz zip) |
| parent | e45bda876ae2e39ac1e11ba1609f2c363ad4959a | commitdiff |
graph: fix coloring around octopus merges
When drawing the graph of an octopus merge, we draw a horizontal line
from parents 3 and above into the asterisk representing the commit. The
sections of this line should be colored to match the graph lines coming
in from above.
However, if the commit is not in the left-most column we do not take
into account the columns to the left of the commit when calculating
these colors. Fix this by adding the appropriate offset to the column
index used for calculating the color.
Signed-off-by: Hemmo Nieminen <hemmo.nieminen@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When drawing the graph of an octopus merge, we draw a horizontal line
from parents 3 and above into the asterisk representing the commit. The
sections of this line should be colored to match the graph lines coming
in from above.
However, if the commit is not in the left-most column we do not take
into account the columns to the left of the commit when calculating
these colors. Fix this by adding the appropriate offset to the column
index used for calculating the color.
Signed-off-by: Hemmo Nieminen <hemmo.nieminen@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| graph.c | diffblobblamehistory |