Skip to content

Commit 50e644b

Browse files
authored
Background - do not sign commits in the background agent session (#3316)
1 parent 1e307bb commit 50e644b

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

src/extension/chatSessions/vscode-node/chatSessionWorktreeServiceImpl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ export class ChatSessionWorktreeService extends Disposable implements IChatSessi
337337
}
338338

339339
// Commit the changes
340-
await this.gitService.commit(vscode.Uri.file(worktreePath), message);
340+
await this.gitService.commit(vscode.Uri.file(worktreePath), message, { all: true, noVerify: true, signCommit: false });
341341
this.logService.trace(`[ChatSessionWorktreeService] Committed all changes in working directory ${worktreePath}`);
342342

343343
// Delete worktree changes from cache

src/platform/git/common/gitService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Event } from '../../../util/vs/base/common/event';
1010
import { IObservable } from '../../../util/vs/base/common/observableInternal';
1111
import { equalsIgnoreCase } from '../../../util/vs/base/common/strings';
1212
import { URI } from '../../../util/vs/base/common/uri';
13-
import { Change, Commit, CommitShortStat, DiffChange, LogOptions, Ref, RefQuery, RepositoryAccessDetails, RepositoryKind, Worktree } from '../vscode/git';
13+
import { Change, Commit, CommitOptions, CommitShortStat, DiffChange, LogOptions, Ref, RefQuery, RepositoryAccessDetails, RepositoryKind, Worktree } from '../vscode/git';
1414

1515
export interface RepoContext {
1616
readonly rootUri: URI;
@@ -71,7 +71,7 @@ export interface IGitService extends IDisposable {
7171
migrateChanges(uri: URI, sourceRepositoryUri: URI, options?: { confirmation?: boolean; deleteFromSource?: boolean; untracked?: boolean }): Promise<void>;
7272

7373
applyPatch(uri: URI, patch: string): Promise<void>;
74-
commit(uri: URI, message: string | undefined): Promise<void>;
74+
commit(uri: URI, message: string | undefined, opts?: CommitOptions): Promise<void>;
7575

7676
getRefs(uri: URI, query: RefQuery, cancellationToken?: CancellationToken): Promise<Ref[]>;
7777
}

src/platform/git/vscode/gitServiceImpl.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { ILogService } from '../../log/common/logService';
2020
import { IGitExtensionService } from '../common/gitExtensionService';
2121
import { IGitService, RepoContext } from '../common/gitService';
2222
import { parseGitRemotes } from '../common/utils';
23-
import { API, APIState, Change, Commit, CommitShortStat, DiffChange, LogOptions, Ref, RefQuery, Repository, RepositoryAccessDetails } from './git';
23+
import { API, APIState, Change, Commit, CommitOptions, CommitShortStat, DiffChange, LogOptions, Ref, RefQuery, Repository, RepositoryAccessDetails } from './git';
2424

2525
export class GitServiceImpl extends Disposable implements IGitService {
2626

@@ -258,14 +258,14 @@ export class GitServiceImpl extends Disposable implements IGitService {
258258
return repository?.getMergeBase(ref1, ref2);
259259
}
260260

261-
async commit(uri: URI, message: string): Promise<void> {
261+
async commit(uri: URI, message: string, opts?: CommitOptions): Promise<void> {
262262
const gitAPI = this.gitExtensionService.getExtensionApi();
263263
const repository = gitAPI?.getRepository(uri);
264264
if (!repository) {
265265
return;
266266
}
267267

268-
await repository.commit(message, { all: true, noVerify: true });
268+
await repository.commit(message, opts);
269269
}
270270

271271
async applyPatch(uri: URI, patch: string): Promise<void> {

src/platform/ignore/node/test/mockGitService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { IObservable } from '../../../../util/vs/base/common/observableInternal'
1010
import { observableValue } from '../../../../util/vs/base/common/observableInternal/observables/observableValue';
1111
import { URI } from '../../../../util/vs/base/common/uri';
1212
import { IGitService, RepoContext } from '../../../git/common/gitService';
13-
import { Change, Commit, CommitShortStat, DiffChange, LogOptions, Ref, RefQuery, RepositoryAccessDetails } from '../../../git/vscode/git';
13+
import { Change, Commit, CommitOptions, CommitShortStat, DiffChange, LogOptions, Ref, RefQuery, RepositoryAccessDetails } from '../../../git/vscode/git';
1414

1515
/**
1616
* A configurable mock implementation of IGitService for testing.
@@ -114,7 +114,7 @@ export class MockGitService implements IGitService {
114114
return Promise.resolve();
115115
}
116116

117-
commit(uri: URI, message: string | undefined): Promise<void> {
117+
commit(uri: URI, message: string | undefined, opts?: CommitOptions): Promise<void> {
118118
return Promise.resolve();
119119
}
120120

src/platform/test/node/simulationWorkspaceServices.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { IFileSystemService } from '../../filesystem/common/fileSystemService';
2929
import { FileType, RelativePattern } from '../../filesystem/common/fileTypes';
3030
import { NodeFileSystemService } from '../../filesystem/node/fileSystemServiceImpl';
3131
import { IGitService, RepoContext } from '../../git/common/gitService';
32-
import { Change, CommitShortStat, DiffChange, Ref, RefQuery, RepositoryAccessDetails } from '../../git/vscode/git';
32+
import { Change, CommitOptions, CommitShortStat, DiffChange, Ref, RefQuery, RepositoryAccessDetails } from '../../git/vscode/git';
3333
import { AbstractLanguageDiagnosticsService } from '../../languages/common/languageDiagnosticsService';
3434
import { ILanguageFeaturesService } from '../../languages/common/languageFeaturesService';
3535
import { ILogService } from '../../log/common/logService';
@@ -800,7 +800,7 @@ export class TestingGitService implements IGitService {
800800
return Promise.resolve();
801801
}
802802

803-
async commit(uri: URI, message: string | undefined): Promise<void> {
803+
async commit(uri: URI, message: string | undefined, opts?: CommitOptions): Promise<void> {
804804
return;
805805
}
806806

0 commit comments

Comments
 (0)