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

gitgraph #2934 support tags for merge commits

Browse Source
This commit is contained in:
Yuriy Husnay
2022-04-19 18:02:41 +03:00
parent fb82a5be46
commit 3f812326a6
3 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/diagrams/git/gitGraphAst.js
View File

@@ -136,7 +136,7 @@ export const branch = function (name) {
}
};
export const merge = function (otherBranch) {
export const merge = function (otherBranch, tag) {
otherBranch = common.sanitizeText(otherBranch, configApi.getConfig());
const currentCommit = commits[branches[curBranch]];
const otherCommit = commits[branches[otherBranch]];
@@ -213,6 +213,7 @@ export const merge = function (otherBranch) {
parents: [head == null ? null : head.id, branches[otherBranch]],
branch: curBranch,
type: commitType.MERGE,
tag: tag ? tag : '',
};
head = commit;
commits[commit.id] = commit;