summaryrefslogtreecommitdiff
path: root/t/t4202-log.sh
diff options
context:
space:
mode:
authorJames Coglan <jcoglan@gmail.com>2019-10-15 23:47:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-16 02:11:25 (GMT)
commit479db18bc0c38ed610fba56f3cc98abd7977e695 (patch)
tree2afb51bffdcba98597eeea727e9458993daca110 /t/t4202-log.sh
parent0195285b956e1b52defa6c259253a7b888fc25df (diff)
downloadgit-479db18bc0c38ed610fba56f3cc98abd7977e695.zip
git-479db18bc0c38ed610fba56f3cc98abd7977e695.tar.gz
git-479db18bc0c38ed610fba56f3cc98abd7977e695.tar.bz2
graph: smooth appearance of collapsing edges on commit lines
When a graph contains edges that are in the process of collapsing to the left, but those edges cross a commit line, the effect is that the edges have a jagged appearance: * |\ | * | \ *-. \ |\ \ \ | | * | | * | | | |/ / * | | |/ / * | |/ * We already takes steps to smooth edges like this when they're expanding; when an edge appears to the right of a merge commit marker on a GRAPH_COMMIT line immediately following a GRAPH_POST_MERGE line, we render it as a `\`: * \ |\ \ | * \ | |\ \ We can make a similar improvement to collapsing edges, making them easier to follow and giving the overall graph a feeling of increased symmetry: * |\ | * | \ *-. \ |\ \ \ | | * | | * | | | |/ / * / / |/ / * / |/ * To do this, we introduce a new special case for edges on GRAPH_COMMIT lines that immediately follow a GRAPH_COLLAPSING line. By retaining a copy of the `mapping` array used to render the GRAPH_COLLAPSING line in the `old_mapping` array, we can determine that an edge is collapsing through the GRAPH_COMMIT line and should be smoothed. Signed-off-by: James Coglan <jcoglan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4202-log.sh')
-rwxr-xr-xt/t4202-log.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index e803ba4..ab0d021 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -667,7 +667,7 @@ cat > expect <<\EOF
* | | fifth
* | | fourth
|/ /
-* | third
+* / third
|/
* second
* initial