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

Git - improve heuristics for determining branch base (#193986)

Browse Source 
* Add getBranchBaseFromReflog

* Read/store branch merge base in the git config

* Add getBranchBase() extension api
This commit is contained in:
Ladislau Szomoru
2023-09-25 16:12:10 +02:00
committed by GitHub
parent 70a9d8f4ea
commit 8e80e950a4
4 changed files with 70 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,6 +177,10 @@ export class ApiRepository implements Repository {
return this.repository.getBranches(query, cancellationToken);
}
getBranchBase(name: string): Promise<Branch | undefined> {
return this.repository.getBranchBase(name);
}
setBranchUpstream(name: string, upstream: string): Promise<void> {
return this.repository.setBranchUpstream(name, upstream);
}

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

@@ -219,6 +219,7 @@ export interface Repository {
deleteBranch(name: string, force?: boolean): Promise<void>;
getBranch(name: string): Promise<Branch>;
getBranches(query: BranchQuery, cancellationToken?: CancellationToken): Promise<Ref[]>;
getBranchBase(name: string): Promise<Branch | undefined>;
setBranchUpstream(name: string, upstream: string): Promise<void>;
getRefs(query: RefQuery, cancellationToken?: CancellationToken): Promise<Ref[]>;