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

Git - use base branch to calculate unpublished commits (#239226)

Browse Source
This commit is contained in:
Ladislau Szomoru
2025-01-30 16:52:17 +01:00
committed by GitHub
parent 727ebc06d8
commit 45212e10fc
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
extensions/git/src/repository.ts
View File

@@ -2770,8 +2770,25 @@ export class Repository implements Disposable {
return this.unpublishedCommits;
}
if (this.HEAD && this.HEAD.name && this.HEAD.upstream && this.HEAD.ahead && this.HEAD.ahead > 0) {
const ref1 = `${this.HEAD.upstream.remote}/${this.HEAD.upstream.name}`;
if (!this.HEAD?.name) {
this.unpublishedCommits = new Set<string>();
return this.unpublishedCommits;
}
if (this.HEAD.upstream) {
// Upstream
if (this.HEAD.ahead === 0) {
this.unpublishedCommits = new Set<string>();
} else {
const ref1 = `${this.HEAD.upstream.remote}/${this.HEAD.upstream.name}`;
const ref2 = this.HEAD.name;
const revList = await this.repository.revList(ref1, ref2);
this.unpublishedCommits = new Set<string>(revList);
}
} else if (this.historyProvider.currentHistoryItemBaseRef) {
// Base
const ref1 = this.historyProvider.currentHistoryItemBaseRef.id;
const ref2 = this.HEAD.name;
const revList = await this.repository.revList(ref1, ref2);