Fixes #3270 incorrectly identifying a worktree

eamodio · eamodio · commit a333b4bb63c6 · 2024-05-14T14:23:41.000-04:00
diff --git a/src/commands/git/switch.ts b/src/commands/git/switch.ts
@@ -205,7 +205,7 @@ export class SwitchGitCommand extends QuickCommand<State> {
 					state.reference.repoPath,
 					w => w.branch?.name === state.reference!.name,
 				);
-				if (worktree != null) {
+				if (worktree != null && !worktree.main) {
 					if (state.fastForwardTo != null) {
 						state.repos[0].merge('--ff-only', state.fastForwardTo.ref);
 					}

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ export class SwitchGitCommand extends QuickCommand<State> {`
`205`	`205`	`state.reference.repoPath,`
`206`	`206`	`w => w.branch?.name === state.reference!.name,`
`207`	`207`	`);`
`208`		`- if (worktree != null) {`
	`208`	`+ if (worktree != null && !worktree.main) {`
`209`	`209`	`if (state.fastForwardTo != null) {`
`210`	`210`	`state.repos[0].merge('--ff-only', state.fastForwardTo.ref);`
`211`	`211`	`}`