Skip to content

Background - handle empty git repositories #308767

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
lszomoru merged 1 commit into from
Apr 9, 2026
+5 −5
Merged

Background - handle empty git repositories #308767

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions ...opilot/src/extension/chatSessions/vscode-node/chatSessionWorktreeCheckpointServiceImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export class ChatSessionWorktreeCheckpointService extends Disposable implements
const repositoryUri = await this._getSessionRepository(sessionId);
const repository = repositoryUri ? await this.gitService.getRepository(repositoryUri) : undefined;

if (!repository) {
if (!repository || !repository.headCommitHash) {
this.logService.warn(`[ChatSessionWorktreeCheckpointService][handleRequest] No repository found for session ${sessionId}, skipping baseline checkpoint creation`);
return;
}
Expand Down Expand Up @@ -83,7 +83,7 @@ export class ChatSessionWorktreeCheckpointService extends Disposable implements
const repositoryUri = await this._getSessionRepository(sessionId);
const repository = repositoryUri ? await this.gitService.getRepository(repositoryUri) : undefined;

if (!repository) {
if (!repository || !repository.headCommitHash) {
this.logService.warn(`[ChatSessionWorktreeCheckpointService][handleRequestCompleted] No repository found for session ${sessionId}, skipping post-turn checkpoint`);
return;
}
Expand Down Expand Up @@ -165,7 +165,7 @@ export class ChatSessionWorktreeCheckpointService extends Disposable implements
}
const repoUri = Uri.file(props.worktreePath);
const repository = await this.gitService.getRepository(repoUri);
if (!repository) {
if (!repository || !repository.headCommitHash) {
this.logService.warn(`[ChatSessionWorktreeCheckpointService][handleAdditionalWorktreesRequest] No repository found for additional worktree ${props.worktreePath}`);
continue;
}
Expand All @@ -187,7 +187,7 @@ export class ChatSessionWorktreeCheckpointService extends Disposable implements
}
const repoUri = Uri.file(props.worktreePath);
const repository = await this.gitService.getRepository(repoUri);
if (!repository) {
if (!repository || !repository.headCommitHash) {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion extensions/copilot/src/extension/chatSessions/vscode-node/folderRepositoryManagerImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export abstract class FolderRepositoryManager extends Disposable implements IFol
repositoryUri = vscode.Uri.file(worktreeProperties.repositoryPath);
} else {
const repoContext = await this.gitService.getRepository(selectedFolder);
const branchBase = repoContext?.headBranchName
const branchBase = repoContext?.headBranchName && repoContext.headCommitHash
? await this.gitService.getBranchBase(repoContext.rootUri, repoContext.headBranchName)
: undefined;

Expand Down
Loading