Allows branches Map to be used

gitkraken · Nov 22, 2023 · 4f318a5 · 4f318a5
1 parent 7645901
commit 4f318a5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/git/models/branch.ts b/src/git/models/branch.ts
@@ -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/')) {

diff --git a/src/git/models/worktree.ts b/src/git/models/worktree.ts
@@ -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];