Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure commits by others to a tracked upstream will update my graph (fix #234979) #235318

Closed
wants to merge 8 commits into from
Closed

Ensure commits by others to a tracked upstream will update my graph (fix #234979) #235318

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
09ebab6
Always resolve base so other commits to a tracked upstream will updat…
gjsjohnmurray Dec 4, 2024
001a79a
Merge branch 'main' into fix-234979
gjsjohnmurray Dec 4, 2024
bbe1c3e
Revert "Always resolve base so other commits to a tracked upstream wi…
gjsjohnmurray Dec 5, 2024
1d464c6
Spot base updates less expensively
gjsjohnmurray Dec 5, 2024
d077de1
Merge branch 'main' into fix-234979
gjsjohnmurray Dec 6, 2024
9264dee
Merge branch 'main' into fix-234979
gjsjohnmurray Dec 12, 2024
293e67a
Merge branch 'main' into fix-234979
gjsjohnmurray Dec 27, 2024
43cc474
Merge branch 'main' into fix-234979
gjsjohnmurray Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion extensions/git/src/historyProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
icon: new ThemeIcon('cloud')
} : undefined;

// Base - compute only if the branch has changed
// Base - compute fully only if the branch has changed
if (this._HEAD?.name !== this.repository.HEAD.name) {
const mergeBase = await this.resolveHEADMergeBase();

Expand All @@ -140,6 +140,12 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
revision: mergeBase.commit,
icon: new ThemeIcon('cloud')
} : undefined;
} else if (this._currentHistoryItemBaseRef) {
// otherwise spot a newer commit
const revision = (await this.repository.getBranch(this._currentHistoryItemBaseRef.name)).commit;
if (revision && this._currentHistoryItemBaseRef.revision !== revision) {
this._currentHistoryItemBaseRef = { ...this._currentHistoryItemBaseRef, revision };
}
}
} else {
// Detached commit
Expand Down