fix(sidebar): let parent repo rows select the main worktree

Author: ignatremizov

app/src/lib/stores/app-store.ts

@@ -2176,7 +2176,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
   /** This shouldn't be called directly. See `Dispatcher`. */
   public async _selectRepository(
     repository: Repository | CloningRepository | null,
-    persistSelection: boolean = true
+    persistSelection: boolean = true,
+    followPreferredWorktree: boolean = true
   ): Promise<Repository | null> {
     const previouslySelectedRepository = this.selectedRepository
 
@@ -2212,7 +2213,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
     // When returning to a repository that has worktrees, restore the
     // previously active linked worktree so the user doesn't always land
     // on the main worktree after switching repos.
-    if (!repository.isLinkedWorktree) {
+    if (followPreferredWorktree && !repository.isLinkedWorktree) {
       const repoPath = normalizePath(repository.path)
       const preferredPath = getPreferredWorktreePath(repoPath)
 

app/src/ui/app.tsx

@@ -3827,7 +3827,7 @@ export class App extends React.Component<IAppProps, IAppState> {
   }
 
   private onSelectionChanged = (repository: Repository | CloningRepository) => {
-    this.props.dispatcher.selectRepository(repository)
+    this.props.dispatcher.selectRepository(repository, true, false)
     this.props.dispatcher.closeFoldout(FoldoutType.Repository)
   }
 

app/src/ui/dispatcher/dispatcher.ts

@@ -314,9 +314,14 @@ export class Dispatcher {
   /** Select the repository. */
   public selectRepository(
     repository: Repository | CloningRepository,
-    persistSelection: boolean = true
+    persistSelection: boolean = true,
+    followPreferredWorktree: boolean = true
   ): Promise<Repository | null> {
-    return this.appStore._selectRepository(repository, persistSelection)
+    return this.appStore._selectRepository(
+      repository,
+      persistSelection,
+      followPreferredWorktree
+    )
   }
 
   /** Change the selected section in the repository. */