marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-25 02:09:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

GitGraph: added destination branch check into overlapping fn.

Browse Source
This commit is contained in:
Guy Pursey
2023-10-12 21:15:54 +01:00
parent 69ec4a0359
commit 8c43d2273f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/mermaid/src/diagrams/git/gitGraphRenderer.js
View File

@@ -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
);
/**