File tree Expand file tree Collapse file tree 2 files changed +3
-2
lines changed
env/node/git/sub-providers Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -13,6 +13,7 @@ import { GitBranch } from '../../../../git/models/branch';
1313import { getLocalBranchByUpstream , isDetachedHead } from '../../../../git/models/branch.utils' ;
1414import type { MergeConflict } from '../../../../git/models/mergeConflict' ;
1515import type { GitBranchReference } from '../../../../git/models/reference' ;
16+ import { getReferenceFromBranch } from '../../../../git/models/reference.utils' ;
1617import { createRevisionRange } from '../../../../git/models/revision.utils' ;
1718import { parseGitBranches } from '../../../../git/parsers/branchParser' ;
1819import { parseMergeTreeConflict } from '../../../../git/parsers/mergeTreeParser' ;
@@ -334,7 +335,7 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
334335 if ( result . merged ) {
335336 return {
336337 ...result ,
337- localBranchOnly : { name : localIntoBranch . name } ,
338+ localBranchOnly : getReferenceFromBranch ( localIntoBranch ) ,
338339 } ;
339340 }
340341 }
Original file line number Diff line number Diff line change @@ -374,7 +374,7 @@ export type MergeDetectionConfidence = 'highest' | 'high' | 'medium';
374374
375375export type GitBranchMergedStatus =
376376 | { merged : false }
377- | { merged : true ; confidence : MergeDetectionConfidence ; localBranchOnly ?: { name : string } } ;
377+ | { merged : true ; confidence : MergeDetectionConfidence ; localBranchOnly ?: GitBranchReference } ;
378378
379379export interface GitBranchesSubProvider {
380380 getBranch ( repoPath : string , name ?: string ) : Promise < GitBranch | undefined > ;
You can’t perform that action at this time.
0 commit comments