GitGraph: added destination branch check into overlapping fn.

2023-10-12 21:15:54 +01:00 · 2023-10-12 21:15:54 +01:00 · 8c43d2273f
parent 69ec4a0359
commit 8c43d2273f
1 changed files with 3 additions and 1 deletions
--- 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
  );

 /**