Browse Source

Allows branches Map to be used

main
Eric Amodio 1 year ago
parent
commit
4f318a5461
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      src/git/models/branch.ts
  2. +1
    -1
      src/git/models/worktree.ts

+ 1
- 1
src/git/models/branch.ts View File

@ -295,7 +295,7 @@ export function sortBranches(branches: GitBranch[], options?: BranchSortOptions)
export async function getLocalBranchByUpstream(
repo: Repository,
remoteBranchName: string,
branches?: PageableResult<GitBranch>,
branches?: PageableResult<GitBranch> | Map<unknown, GitBranch>,
): Promise<GitBranch | undefined> {
let qualifiedRemoteBranchName;
if (remoteBranchName.startsWith('remotes/')) {

+ 1
- 1
src/git/models/worktree.ts View File

@ -87,7 +87,7 @@ export async function getWorktreeForBranch(
branchName: string,
upstreamNames: string | string[],
worktrees?: GitWorktree[],
branches?: PageableResult<GitBranch>,
branches?: PageableResult<GitBranch> | Map<unknown, GitBranch>,
): Promise<GitWorktree | undefined> {
if (upstreamNames != null && !Array.isArray(upstreamNames)) {
upstreamNames = [upstreamNames];

Loading…
Cancel
Save