Improves branch worktree checks

Refs #4201

Author: eamodio

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

@@ -133,7 +133,8 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 		if (resultsPromise == null) {
 			async function load(this: BranchesGitSubProvider): Promise<PagedResult<GitBranch>> {
 				try {
-					const parser = getBranchParser(await this.git.supports('git:for-each-ref:worktreePath'));
+					const supportsWorktreePath = await this.git.supports('git:for-each-ref:worktreePath');
+					const parser = getBranchParser(supportsWorktreePath);
 
 					const data = await this.git.exec(
 						{ cwd: repoPath },
@@ -178,11 +179,10 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 								entry.date ? new Date(entry.date) : undefined,
 								entry.sha,
 								upstream,
-								worktreePath
-									? {
-											path: worktreePath,
-											isDefault: worktreePath === defaultWorktreePath,
-									  }
+								supportsWorktreePath
+									? worktreePath
+										? { path: worktreePath, isDefault: worktreePath === defaultWorktreePath }
+										: false
 									: undefined,
 							),
 						);
@@ -488,7 +488,9 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 
 			return { merged: false };
 		} catch (ex) {
-			Logger.error(ex, scope);
+			if (Logger.enabled('debug')) {
+				Logger.error(ex, scope);
+			}
 			return { merged: false };
 		}
 	}

src/git/models/branch.ts

@@ -48,7 +48,7 @@ export class GitBranch implements GitBranchReference {
 		public readonly date: Date | undefined,
 		public readonly sha?: string,
 		public readonly upstream?: GitTrackingUpstream,
-		public readonly worktree?: { path: string; isDefault: boolean },
+		public readonly worktree?: { path: string; isDefault: boolean } | false,
 		detached: boolean = false,
 		public readonly rebasing: boolean = false,
 	) {
@@ -178,10 +178,14 @@ export class GitBranch implements GitBranchReference {
 
 	@debug()
 	async getWorktree(): Promise<GitWorktree | undefined> {
-		if (this.worktree == null) return undefined;
+		if (this.worktree === false) return undefined;
+		if (this.worktree == null) {
+			const { id } = this;
+			return this.container.git.worktrees(this.repoPath)?.getWorktree(wt => wt.branch?.id === id);
+		}
 
-		const worktreePath = this.worktree.path;
-		return this.container.git.worktrees(this.repoPath)?.getWorktree(wt => wt.path === worktreePath);
+		const { path } = this.worktree;
+		return this.container.git.worktrees(this.repoPath)?.getWorktree(wt => wt.path === path);
 	}
 
 	get starred(): boolean {

src/plus/integrations/providers/github/sub-providers/branches.ts

@@ -62,7 +62,7 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 								undefined,
 								revision.revision,
 								undefined,
-								undefined,
+								false,
 								true,
 							);
 					}
@@ -112,12 +112,30 @@ export class BranchesGitSubProvider implements GitBranchesSubProvider {
 						const ref = branch.target.oid;
 
 						branches.push(
-							new GitBranch(container, repoPath!, `refs/heads/${branch.name}`, current, date, ref, {
-								name: `origin/${branch.name}`,
-								missing: false,
-								state: { ahead: 0, behind: 0 },
-							}),
-							new GitBranch(container, repoPath!, `refs/remotes/origin/${branch.name}`, false, date, ref),
+							new GitBranch(
+								container,
+								repoPath!,
+								`refs/heads/${branch.name}`,
+								current,
+								date,
+								ref,
+								{
+									name: `origin/${branch.name}`,
+									missing: false,
+									state: { ahead: 0, behind: 0 },
+								},
+								false,
+							),
+							new GitBranch(
+								container,
+								repoPath!,
+								`refs/remotes/origin/${branch.name}`,
+								false,
+								date,
+								ref,
+								undefined,
+								false,
+							),
 						);
 					}
 

src/webviews/home/homeWebview.ts

@@ -1201,7 +1201,9 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 		const { repo, branch } = await this.getRepoInfoFromRef(ref);
 		if (branch == null) return;
 
-		if (branch.current && mergeTarget != null && (!branch.worktree || branch.worktree.isDefault)) {
+		const worktree = branch.worktree === false ? undefined : branch.worktree ?? (await branch.getWorktree());
+
+		if (branch.current && mergeTarget != null && (!worktree || worktree.isDefault)) {
 			const mergeTargetLocalBranchName = getBranchNameWithoutRemote(mergeTarget.branchName);
 			const confirm = await window.showWarningMessage(
 				`Before deleting the current branch '${branch.name}', you will be switched to '${mergeTargetLocalBranchName}'.`,
@@ -1221,7 +1223,7 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 					references: branch,
 				},
 			});
-		} else if (repo != null && branch?.worktree != null && !branch.worktree.isDefault) {
+		} else if (repo != null && worktree != null && !worktree.isDefault) {
 			const commonRepo = await repo.getCommonRepository();
 			const defaultWorktree = await repo.git.worktrees?.()?.getWorktree(w => w.isDefault);
 			if (defaultWorktree == null || commonRepo == null) return;