Skip to content

refactor(ng-dev): centralize commit count logic in API merge strategy #3186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alan-agius4 merged 1 commit into from
Oct 23, 2025
Merged

refactor(ng-dev): centralize commit count logic in API merge strategy #3186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions ng-dev/pr/merge/strategies/api-merge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ export class GithubApiMergeStrategy extends AutosquashMergeStrategy {
const commits = await this.getPullRequestCommits(pullRequest);
const {squashCount, fixupCount, normalCommitsCount} = await this.getCommitsInfo(pullRequest);
const method = this.getMergeActionFromPullRequest(pullRequest);
let pullRequestCommitCount = pullRequest.commitCount;
const mergeOptions: OctokitMergeParams = {
pull_number: prNumber,
merge_method: method === 'auto' ? 'rebase' : method,
Expand Down Expand Up @@ -91,7 +90,6 @@ export class GithubApiMergeStrategy extends AutosquashMergeStrategy {
// The commit message from the single normal commit is used.
if (hasOnlyFixUpForOneCommit) {
mergeOptions.merge_method = 'squash';
pullRequestCommitCount = 1;

// The first commit is the correct one, whatever follows are fixups.
const [title, message = ''] = commits[0].message.split(COMMIT_HEADER_SEPARATOR);
Expand All @@ -103,7 +101,6 @@ export class GithubApiMergeStrategy extends AutosquashMergeStrategy {
// squashed and the user is prompted to edit the commit message.
} else if (hasOnlySquashForOneCommit) {
mergeOptions.merge_method = 'squash';
pullRequestCommitCount = 1;

await this._promptCommitMessageEdit(pullRequest, mergeOptions);
}
Expand Down Expand Up @@ -173,6 +170,10 @@ export class GithubApiMergeStrategy extends AutosquashMergeStrategy {
return;
}

// Merge and Squash will merge the PR with a single commit.
const pullRequestCommitCount =
mergeOptions.merge_method === 'rebase' ? pullRequest.commitCount : 1;

// Cherry pick the merged commits into the remaining target branches.
const failedBranches = await this.cherryPickIntoTargetBranches(
// Number of commits that have landed in the target branch. This could vary from
Expand Down
Loading