From 7a743489a19476c617f89a639f63726aede85d80 Mon Sep 17 00:00:00 2001
From: Markus Olsson <j.markus.olsson@gmail.com>
Date: Mon, 29 Apr 2024 14:11:51 +0200
Subject: [PATCH] Don't attempt to update remote head if pull fails

---
 app/src/lib/stores/app-store.ts | 15 ++++++---------
 app/src/lib/stores/git-store.ts |  7 ++++---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts
index 8ddf71dc45..9bde2100e8 100644
--- a/app/src/lib/stores/app-store.ts
+++ b/app/src/lib/stores/app-store.ts
@@ -4653,21 +4653,18 @@ export class AppStore extends TypedBaseStore<IAppState> {
           }
 
           await gitStore.performFailableOperation(
-            () =>
-              pullRepo(repository, account, remote, progress => {
+            async () => {
+              await pullRepo(repository, account, remote, progress => {
                 this.updatePushPullFetchProgress(repository, {
                   ...progress,
                   value: progress.value * pullWeight,
                 })
-              }),
-            {
-              gitContext,
-              retryAction,
-            }
+              })
+              await updateRemoteHEAD(repository, account, remote)
+            },
+            { gitContext, retryAction }
           )
 
-          await updateRemoteHEAD(repository, account, remote)
-
           const refreshStartProgress = pullWeight + fetchWeight
           const refreshTitle = __DARWIN__
             ? 'Refreshing Repository'
diff --git a/app/src/lib/stores/git-store.ts b/app/src/lib/stores/git-store.ts
index 59221cc8dc..5f16e0bd09 100644
--- a/app/src/lib/stores/git-store.ts
+++ b/app/src/lib/stores/git-store.ts
@@ -1060,11 +1060,12 @@ export class GitStore extends BaseStore {
       repository: this.repository,
     }
     await this.performFailableOperation(
-      () => fetchRepo(this.repository, account, remote, progressCallback),
+      async () => {
+        await fetchRepo(this.repository, account, remote, progressCallback)
+        await updateRemoteHEAD(this.repository, account, remote)
+      },
       { backgroundTask, retryAction }
     )
-
-    await updateRemoteHEAD(this.repository, account, remote)
   }
 
   /**