From a1087c93677bc0304c98f14915b1843e470e4a55 Mon Sep 17 00:00:00 2001 From: Derrick Stolee Date: Tue, 7 Jan 2020 21:27:02 +0000 Subject: graph: fix lack of color in horizontal lines In some cases, horizontal lines in rendered graphs can lose their coloring. This is due to a use of graph_line_addch() instead of graph_line_write_column(). Using a ternary operator to pick the character is nice for compact code, but we actually need a column to provide the color. Add a test to t4215-log-skewed-merges.sh to prevent regression. Reported-by: Jeff King Signed-off-by: Derrick Stolee Signed-off-by: Junio C Hamano --- graph.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'graph.c') diff --git a/graph.c b/graph.c index f514ed3efa..aaf97069bd 100644 --- a/graph.c +++ b/graph.c @@ -1063,7 +1063,7 @@ static void graph_output_post_merge_line(struct git_graph *graph, struct graph_l int i, j; struct commit_list *first_parent = first_interesting_parent(graph); - int seen_parent = 0; + struct column *parent_col = NULL; /* * Output the post-merge row @@ -1117,12 +1117,17 @@ static void graph_output_post_merge_line(struct git_graph *graph, struct graph_l graph_line_addch(line, ' '); } else { graph_line_write_column(line, col, '|'); - if (graph->merge_layout != 0 || i != graph->commit_index - 1) - graph_line_addch(line, seen_parent ? '_' : ' '); + if (graph->merge_layout != 0 || i != graph->commit_index - 1) { + if (parent_col) + graph_line_write_column( + line, parent_col, '_'); + else + graph_line_addch(line, ' '); + } } if (col_commit == first_parent->item) - seen_parent = 1; + parent_col = col; } /* -- cgit v1.2.3