Skip to content
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ export class ChatSessionWorktreeService extends Disposable implements IChatSessi
}

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

// Delete worktree changes from cache
Expand Down
4 changes: 2 additions & 2 deletions src/platform/git/common/gitService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Event } from '../../../util/vs/base/common/event';
import { IObservable } from '../../../util/vs/base/common/observableInternal';
import { equalsIgnoreCase } from '../../../util/vs/base/common/strings';
import { URI } from '../../../util/vs/base/common/uri';
import { Change, Commit, CommitShortStat, DiffChange, LogOptions, Ref, RefQuery, RepositoryAccessDetails, RepositoryKind, Worktree } from '../vscode/git';
import { Change, Commit, CommitOptions, CommitShortStat, DiffChange, LogOptions, Ref, RefQuery, RepositoryAccessDetails, RepositoryKind, Worktree } from '../vscode/git';

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

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

getRefs(uri: URI, query: RefQuery, cancellationToken?: CancellationToken): Promise<Ref[]>;
}
Expand Down
6 changes: 3 additions & 3 deletions src/platform/git/vscode/gitServiceImpl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { ILogService } from '../../log/common/logService';
import { IGitExtensionService } from '../common/gitExtensionService';
import { IGitService, RepoContext } from '../common/gitService';
import { parseGitRemotes } from '../common/utils';
import { API, APIState, Change, Commit, CommitShortStat, DiffChange, LogOptions, Ref, RefQuery, Repository, RepositoryAccessDetails } from './git';
import { API, APIState, Change, Commit, CommitOptions, CommitShortStat, DiffChange, LogOptions, Ref, RefQuery, Repository, RepositoryAccessDetails } from './git';

export class GitServiceImpl extends Disposable implements IGitService {

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

async commit(uri: URI, message: string): Promise<void> {
async commit(uri: URI, message: string, opts?: CommitOptions): Promise<void> {
const gitAPI = this.gitExtensionService.getExtensionApi();
const repository = gitAPI?.getRepository(uri);
if (!repository) {
return;
}

await repository.commit(message, { all: true, noVerify: true });
await repository.commit(message, opts);
}

async applyPatch(uri: URI, patch: string): Promise<void> {
Expand Down
4 changes: 2 additions & 2 deletions src/platform/ignore/node/test/mockGitService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { IObservable } from '../../../../util/vs/base/common/observableInternal'
import { observableValue } from '../../../../util/vs/base/common/observableInternal/observables/observableValue';
import { URI } from '../../../../util/vs/base/common/uri';
import { IGitService, RepoContext } from '../../../git/common/gitService';
import { Change, Commit, CommitShortStat, DiffChange, LogOptions, Ref, RefQuery, RepositoryAccessDetails } from '../../../git/vscode/git';
import { Change, Commit, CommitOptions, CommitShortStat, DiffChange, LogOptions, Ref, RefQuery, RepositoryAccessDetails } from '../../../git/vscode/git';

/**
* A configurable mock implementation of IGitService for testing.
Expand Down Expand Up @@ -114,7 +114,7 @@ export class MockGitService implements IGitService {
return Promise.resolve();
}

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

Expand Down
4 changes: 2 additions & 2 deletions src/platform/test/node/simulationWorkspaceServices.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { IFileSystemService } from '../../filesystem/common/fileSystemService';
import { FileType, RelativePattern } from '../../filesystem/common/fileTypes';
import { NodeFileSystemService } from '../../filesystem/node/fileSystemServiceImpl';
import { IGitService, RepoContext } from '../../git/common/gitService';
import { Change, CommitShortStat, DiffChange, Ref, RefQuery, RepositoryAccessDetails } from '../../git/vscode/git';
import { Change, CommitOptions, CommitShortStat, DiffChange, Ref, RefQuery, RepositoryAccessDetails } from '../../git/vscode/git';
import { AbstractLanguageDiagnosticsService } from '../../languages/common/languageDiagnosticsService';
import { ILanguageFeaturesService } from '../../languages/common/languageFeaturesService';
import { ILogService } from '../../log/common/logService';
Expand Down Expand Up @@ -800,7 +800,7 @@ export class TestingGitService implements IGitService {
return Promise.resolve();
}

async commit(uri: URI, message: string | undefined): Promise<void> {
async commit(uri: URI, message: string | undefined, opts?: CommitOptions): Promise<void> {
return;
}

Expand Down
Loading