From c967b353c0deb603ec543983f6a672d333ea30f6 Mon Sep 17 00:00:00 2001 From: Caspar Duregger Date: Wed, 4 Nov 2026 00:11:53 +0100 Subject: [PATCH] graph: do not indent visual roots with columns to their right Since a34c00d96 (graph: indent visual root in graph, 2026-07-14), a visual root that has a child is drawn indented, connected to its child by an extra GRAPH_PRE_ROOT line. When there are columns to the right of the root, this breaks the graph: * M |\ \ | * | R / | * T |/ * B graph_output_pre_root_line() writes the extra " " for the root column without shifting the columns to its right, so they are drawn between two columns. graph_output_commit_line() then pushes them one column to the right, but the following GRAPH_COLLAPSING line is computed from the mapping, which knows nothing about that offset. The column next to R does not continue into the next line, and with more columns to the right of R one of them goes nowhere. But in this situation the indentation is not needed in the first place. The columns to the right of the root collapse into its column once it is rendered, so the collapsing line always leaves a blank right below the root, and the next commit cannot end up vertically adjacent to it. Do not consider a commit a visual root when there are columns to its right, which gives: * M |\ * | R / | * T |/ * B Signed-off-by: Caspar Duregger Acked-by: Pablo Sabater Signed-off-by: Junio C Hamano --- graph.c | 12 ++++++++++++ t/t4218-log-graph-indentation.sh | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/graph.c b/graph.c index 28bef1b88f..95eef3a95e 100644 --- a/graph.c +++ b/graph.c @@ -969,10 +969,22 @@ static int graph_is_visual_root(struct git_graph *graph, * already a column, so it will not be rendered below, the * current commit has to act as the last commit and omit * indentation. + * + * If there are columns to the right of the commit, they collapse + * into its column once it is rendered, so nothing can be rendered + * right below it and there is no need to indent it. + * + * * | <- visual root with a column to its right + * / + * | * + * + * Indenting it would also push these columns to the right, but + * the collapsing code does not know about that offset. */ return graph_is_visual_root_candidate(graph->commit, graph) && !(graph->commit_in_columns && graph->columns[graph->commit_index].is_merge_parent) && + graph->commit_index + 1 >= graph->num_columns && flags->is_next_visible && (!flags->next_has_column || graph->visual_root_depth > 0); } diff --git a/t/t4218-log-graph-indentation.sh b/t/t4218-log-graph-indentation.sh index 24dc9b497d..b3b9f7c144 100755 --- a/t/t4218-log-graph-indentation.sh +++ b/t/t4218-log-graph-indentation.sh @@ -449,6 +449,24 @@ test_expect_success 'two unrelated merges' ' EOF ' +test_expect_success 'visual root with columns to its right is not indented' ' + create_orphan _70 && test_commit 70_A && + git checkout -b _71 && test_commit 71_A && + create_orphan _72 && test_commit 72_A && + TREE=$(git write-tree) && + MERGE=$(git commit-tree $TREE -p _72 -p _70 -m 72_merge) && + git reset --hard $MERGE && + lib_test_check_graph _72 _71 <<-\EOF + * 72_merge + |\ + * | 72_A + / + | * 71_A + |/ + * 70_A + EOF +' + test_expect_success '--max-count treats the last visible commit as the last commit' ' lib_test_check_graph --max-count=2 _8 _9 _10 <<-\EOF * 10_A