GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity

GitGraph: removed check of branch with main from arrow reroute fn

Browse Source 
Checking if branch was same as main turned out to be redundant
for now, since there don't seem to be any cases where routing
curves into main.

This fixes issue found in review by @nirname and avoids a
situation where branching from the same commit results in
unnecessary rerouting.
This commit is contained in:
Guy Pursey 2023-10-15 13:34:27 +01:00
parent 3ba33c8b75
commit 3e18e76d31
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -358,9 +358,8 @@ const drawCommits = (svg, commits, modifyGraph) => {
const shouldRerouteArrow = (commitA, commitB, allCommits) => {
const isOnSourceBranch = (x) => x.branch === commitA.branch;
const isBetweenCommits = (x) => x.seq > commitA.seq && x.seq < commitB.seq;
const sourceIsMain = commitA.branch === getConfig().gitGraph.mainBranchName;
return Object.values(allCommits).some((commitX) => {
return isBetweenCommits(commitX) && (sourceIsMain || isOnSourceBranch(commitX));
return isBetweenCommits(commitX) && isOnSourceBranch(commitX);
});
};