GitGraph: simplified overlapping check fn

mermaid-js · Oct 13, 2023 · 86b296b · 86b296b
1 parent f713548
commit 86b296b
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/packages/mermaid/src/diagrams/git/gitGraphRenderer.js b/packages/mermaid/src/diagrams/git/gitGraphRenderer.js
@@ -353,14 +353,10 @@ const drawCommits = (svg, commits, modifyGraph) => {
  */
 const hasOverlappingCommits = (commitA, commitB, allCommits) => {
   const isOnSourceBranch = (x) => x.branch === commitA.branch;
-  const isOnTargetBranch = (x) => x.branch === commitB.branch;
   const isBetweenCommits = (x) => x.seq > commitA.seq && x.seq < commitB.seq;
-  const isTargetMain = (x) => x.branch === getConfig().gitGraph.mainBranchName;
+  const sourceIsMain = commitA.branch === getConfig().gitGraph.mainBranchName;
   return Object.values(allCommits).some((commitX) => {
-    return (
-      (isOnSourceBranch(commitX) || (isOnTargetBranch(commitX) && !isTargetMain(commitX))) &&
-      isBetweenCommits(commitX)
-    );
+    return isBetweenCommits(commitX) && (sourceIsMain || isOnSourceBranch(commitX));
   });
 };