Skip to content
  • Hemmo Nieminen's avatar
    graph: fix coloring around octopus merges · 339c17bc
    Hemmo Nieminen authored and Junio C Hamano's avatar Junio C Hamano committed
    
    
    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: default avatarHemmo Nieminen <hemmo.nieminen@iki.fi>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    339c17bc