Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion build/cherry-pick.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ const conventionalCommitsParser = require('conventional-commits-parser');
const chalk = require('chalk');
const { version } = require('../package.json');

// Node's default execSync buffer (~1 MiB) is too small for `git log` on long histories.
const GIT_LOG_EXEC_OPTS = { maxBuffer: 50 * 1024 * 1024 };

const releaseType = process.argv[2];
let ignoreCommits = process.argv[3];

Expand Down Expand Up @@ -50,7 +53,8 @@ function getCommits(branch) {
// all commits are too large for execSync buffer size so we'll just get since the last 3 years
const date = new Date(new Date().setFullYear(new Date().getFullYear() - 3));
const stdout = execSync(
`git log ${branch || ''} --abbrev-commit --since=${date.getFullYear()}`
`git log ${branch || ''} --no-merges --abbrev-commit --since=${date.getFullYear()}`,
GIT_LOG_EXEC_OPTS
).toString();
const allCommits = stdout
.split(/commit (?=[\w\d]{8}[\n\r])/)
Expand Down
Loading