From 8c43d2273fae230bc678c6e6061df07b89627c38 Mon Sep 17 00:00:00 2001 From: Guy Pursey Date: Thu, 12 Oct 2023 21:15:54 +0100 Subject: [PATCH] GitGraph: added destination branch check into overlapping fn. --- packages/mermaid/src/diagrams/git/gitGraphRenderer.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/mermaid/src/diagrams/git/gitGraphRenderer.js b/packages/mermaid/src/diagrams/git/gitGraphRenderer.js index 08d99ccba..c1a11f2b4 100644 --- a/packages/mermaid/src/diagrams/git/gitGraphRenderer.js +++ b/packages/mermaid/src/diagrams/git/gitGraphRenderer.js @@ -354,7 +354,9 @@ const drawCommits = (svg, commits, modifyGraph) => { const hasOverlappingCommits = (commitA, commitB, allCommits) => Object.values(allCommits).some( (commitX) => - commitX.branch === commitA.branch && commitX.seq > commitA.seq && commitX.seq < commitB.seq + (commitX.branch === commitA.branch || commitX.branch === commitB.branch) && + commitX.seq > commitA.seq && + commitX.seq < commitB.seq ); /**