From 4f9cb6701f278ee41e4681cc78522397a46c35ec Mon Sep 17 00:00:00 2001
From: msukkari <michael.sukkarieh@mail.mcgill.ca>
Date: Sat, 27 Sep 2025 17:02:03 -0700
Subject: [PATCH] move unset to finally in fetch

---
 packages/backend/src/git.ts | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/git.ts b/packages/backend/src/git.ts
index f49207ad..c1110625 100644
--- a/packages/backend/src/git.ts
+++ b/packages/backend/src/git.ts
@@ -78,10 +78,6 @@ export const fetchRepository = async (
             "--prune",
             "--progress"
         ]);
-
-        if (authHeader) {
-            await git.raw(["config", "--unset", "http.extraHeader", authHeader]);
-        }
     } catch (error: unknown) {
         const baseLog = `Failed to fetch repository: ${path}`;
         if (env.SOURCEBOT_LOG_LEVEL !== "debug") {
@@ -92,6 +88,16 @@ export const fetchRepository = async (
         } else {
             throw new Error(`${baseLog}. Error: ${error}`);
         }
+    } finally {
+        if (authHeader) {
+            const git = simpleGit({
+                progress: onProgress,
+            }).cwd({
+                path: path,
+            })
+
+            await git.raw(["config", "--unset", "http.extraHeader", authHeader]);
+        }
     }
 }