Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-03 23:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Git - better error handling for git merge-base (#198208)

Browse Source
This commit is contained in:
Ladislau Szomoru
2023-11-14 14:51:17 +01:00
committed by GitHub
parent 67aa71296f
commit ed30010d3f
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/git/src/api/api1.ts
View File

@@ -189,7 +189,7 @@ export class ApiRepository implements Repository {
return this.repository.getRefs(query, cancellationToken);
}
getMergeBase(ref1: string, ref2: string): Promise<string> {
getMergeBase(ref1: string, ref2: string): Promise<string | undefined> {
return this.repository.getMergeBase(ref1, ref2);
}

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

@@ -233,7 +233,7 @@ export interface Repository {
getRefs(query: RefQuery, cancellationToken?: CancellationToken): Promise<Ref[]>;
getMergeBase(ref1: string, ref2: string): Promise<string>;
getMergeBase(ref1: string, ref2: string): Promise<string | undefined>;
tag(name: string, upstream: string): Promise<void>;
deleteTag(name: string): Promise<void>;