development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-02 17:32:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expose git merge as extension API (#202503)

Browse source 
* Expose git merge as extension API
Part of microsoft/vscode-pull-request-github#200

* Respond to PR feedback
This commit is contained in:
Alex Ross 2024-01-15 17:22:43 +01:00 committed by GitHub
parent f70f159413
commit 7109701918
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
extensions/git/src/api/api1.ts
View file

@ -256,6 +256,14 @@ export class ApiRepository implements Repository {
commit(message: string, opts?: CommitOptions): Promise<void> {
return this.repository.commit(message, opts);
}
merge(ref: string): Promise<void> {
return this.repository.merge(ref);
}
mergeAbort(): Promise<void> {
return this.repository.mergeAbort();
}
}
export class ApiGit implements Git {

2
extensions/git/src/api/git.d.ts vendored
View file

@ -257,6 +257,8 @@ export interface Repository {
log(options?: LogOptions): Promise<Commit[]>;
commit(message: string, opts?: CommitOptions): Promise<void>;
merge(ref: string): Promise<void>;
mergeAbort(): Promise<void>;
}
export interface RemoteSource {