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

Git - handle local tracking branches (#238503)

Browse Source
This commit is contained in:
Ladislau Szomoru
2025-01-22 21:51:31 +01:00
committed by GitHub
parent 485f68f364
commit 42e96916ac
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2451,7 +2451,9 @@ export class Repository {
// Upstream commit
if (HEAD && HEAD.upstream) {
const ref = `refs/remotes/${HEAD.upstream.remote}/${HEAD.upstream.name}`;
const ref = HEAD.upstream.remote !== '.'
? `refs/remotes/${HEAD.upstream.remote}/${HEAD.upstream.name}`
: `refs/heads/${HEAD.upstream.name}`;
const commit = await this.revParse(ref);
HEAD = { ...HEAD, upstream: { ...HEAD.upstream, commit } };
}

27
extensions/git/src/historyProvider.ts
View File

@@ -136,12 +136,27 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
historyItemRefName = this.repository.HEAD.name;
// Remote
this._currentHistoryItemRemoteRef = this.repository.HEAD.upstream ? {
id: `refs/remotes/${this.repository.HEAD.upstream.remote}/${this.repository.HEAD.upstream.name}`,
name: `${this.repository.HEAD.upstream.remote}/${this.repository.HEAD.upstream.name}`,
revision: this.repository.HEAD.upstream.commit,
icon: new ThemeIcon('cloud')
} : undefined;
if (this.repository.HEAD.upstream) {
if (this.repository.HEAD.upstream.remote === '.') {
// Local branch
this._currentHistoryItemRemoteRef = {
id: `refs/heads/${this.repository.HEAD.upstream.name}`,
name: this.repository.HEAD.upstream.name,
revision: this.repository.HEAD.upstream.commit,
icon: new ThemeIcon('gi-branch')
};
} else {
// Remote branch
this._currentHistoryItemRemoteRef = {
id: `refs/remotes/${this.repository.HEAD.upstream.remote}/${this.repository.HEAD.upstream.name}`,
name: `${this.repository.HEAD.upstream.remote}/${this.repository.HEAD.upstream.name}`,
revision: this.repository.HEAD.upstream.commit,
icon: new ThemeIcon('cloud')
};
}
} else {
this._currentHistoryItemRemoteRef = undefined;
}
// Base
if (this._HEAD?.name !== this.repository.HEAD.name) {