fix(utils): miss Merge pull request analysising

siujs · Jan 11, 2021 · 34a6445 · 34a6445
1 parent ce2eea6
commit 34a6445
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/packages/utils/lib/git.ts b/packages/utils/lib/git.ts
@@ -112,6 +112,8 @@ export type GroupedCommitsItem = Commit & {
 		userEmail: string;
 		time: string;
 	};
+	pullId?: string;
+	pullSource?: string;
 	breaking: boolean;
 };
 
@@ -140,7 +142,10 @@ export function getGroupedCommits(
 					.filter(commit => commit.trim())
 					.reduce(
 						(prev, commit) => {
-							const node = parser.sync(commit);
+							const node = parser.sync(commit, {
+								mergePattern: /^(Merge) pull request #(\d+) from (.*)$/,
+								mergeCorrespondence: ["type", "pullId", "pullSource"]
+							});
 							const extra = node.extra.split("\n");
 
 							const breaking =