Skip to content

Commit 980d12a

Browse files
committed
Includes remote flag in merge base branch context
(#4443, #4522)
1 parent c1be061 commit 980d12a

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

src/env/node/git/sub-providers/graph.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@ export class GraphGitSubProvider implements GitGraphSubProvider {
374374
}),
375375
mergeBase: mergeBase && {
376376
...mergeBase,
377+
remote: branchMap.get(mergeBase?.branch)?.remote ?? false,
377378
},
378379
},
379380
};

src/webviews/plus/graph/graphWebview.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3259,6 +3259,7 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
32593259
base: createReference(mergeBase.branch, ref.repoPath, {
32603260
refType: 'branch',
32613261
name: mergeBase.branch,
3262+
remote: mergeBase.remote,
32623263
}),
32633264
source: { source: 'graph' },
32643265
});

src/webviews/plus/graph/protocol.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ export interface GraphIssueContextValue {
567567
export interface GraphBranchContextValue {
568568
type: 'branch';
569569
ref: GitBranchReference;
570-
mergeBase?: { commit: string; branch: string };
570+
mergeBase?: { commit: string; branch: string; remote: boolean };
571571
}
572572

573573
export interface GraphCommitContextValue {

0 commit comments

Comments
 (0)