Merge branch 'main' of https://github.com/pol-rivero/github-desktop-plus

Author: pol-rivero

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

@@ -5801,7 +5801,10 @@ export class AppStore extends TypedBaseStore<IAppState> {
   }
 
   /** This shouldn't be called directly. See `Dispatcher`. */
-  private async performPull(repository: Repository): Promise<void> {
+  private async performPull(
+    repository: Repository,
+    allowRetry = true
+  ): Promise<void> {
     return this.withPushPullFetch(repository, async () => {
       const gitStore = this.gitStoreCache.get(repository)
 
@@ -5826,6 +5829,14 @@ export class AppStore extends TypedBaseStore<IAppState> {
         throw new Error('The current repository is in a detached HEAD state.')
       }
 
+      if (tip.kind === TipState.Unknown && allowRetry) {
+        console.warn(
+          `Repo ${repository.name} was in an unknown state (not loaded) when trying to pull. Refreshing repository and trying again.`
+        )
+        await this._refreshRepository(repository)
+        return this.performPull(repository, false)
+      }
+
       if (tip.kind === TipState.Valid) {
         let mergeBase: string | null = null
         let gitContext: GitErrorContext | undefined = undefined