Skip to content

Commit 09a06cf

Browse files
committed
Includes remote flag in merge base branch context
(#4443, #4522)
1 parent ba61eeb commit 09a06cf

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3292,7 +3292,7 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
32923292
base: createReference(mergeBase.branch, ref.repoPath, {
32933293
refType: 'branch',
32943294
name: mergeBase.branch,
3295-
remote: false,
3295+
remote: mergeBase.remote,
32963296
}),
32973297
source: { source: 'graph' },
32983298
});

src/webviews/plus/graph/protocol.ts

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

576576
export interface GraphCommitContextValue {

0 commit comments

Comments
 (0)