Skip to content

Don't surface merge-base enrichment failures as error popups #8769

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

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
+17 −8
Draft

Don't surface merge-base enrichment failures as error popups #8769

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0e8828
Initial plan
Copilot Jun 3, 2026
55133d9
Don't show error popup when PR merge base fetch fails
Copilot Jun 3, 2026
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
25 changes: 17 additions & 8 deletions src/github/folderRepositoryManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2306,17 +2306,26 @@ export class FolderRepositoryManager extends Disposable {
}

if (!pullRequest.mergeBase) {
const { data } = await octokit.call(octokit.api.repos.compareCommits, {
repo: remote.repositoryName,
owner: remote.owner,
base: `${pullRequest.base.repositoryCloneUrl.owner}:${pullRequest.base.ref}`,
head: `${pullRequest.head.repositoryCloneUrl.owner}:${pullRequest.head.ref}`,
});
try {
const { data } = await octokit.call(octokit.api.repos.compareCommits, {
repo: remote.repositoryName,
owner: remote.owner,
base: `${pullRequest.base.repositoryCloneUrl.owner}:${pullRequest.base.ref}`,
head: `${pullRequest.head.repositoryCloneUrl.owner}:${pullRequest.head.ref}`,
});

pullRequest.mergeBase = data.merge_base_commit.sha;
pullRequest.mergeBase = data.merge_base_commit.sha;
} catch (e) {
// Computing the merge base via the compare-commits API can fail (for example,
// returning 404 for cross-fork pull requests with divergent histories or when
// a fork has been deleted). This is non-fatal enrichment data, so log and fall
// back to the base sha rather than surfacing an error popup to the user.
Logger.warn(`Fetching Pull Request merge base failed: ${formatError(e)}`, this.id);
pullRequest.mergeBase = pullRequest.base.sha;
}
}
} catch (e) {
vscode.window.showErrorMessage(vscode.l10n.t('Fetching Pull Request merge base failed: {0}', formatError(e)));
Logger.error(`Fulfill pull request missing info failed: ${formatError(e)}`, this.id);
}
Logger.debug(`Fulfill pull request missing info - done`, this.id);
}
Expand Down