From 25383785c7072b39d3ccd59b172bc10ce42297ac Mon Sep 17 00:00:00 2001
From: Jordon <16258926+Jordonbc@users.noreply.github.com>
Date: Mon, 16 Mar 2026 18:12:54 +0000
Subject: [PATCH 1/5] Apply suggested fix to
Frontend/src/scripts/features/branches.ts from Copilot Autofix
Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>
---
Frontend/src/scripts/features/branches.ts | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Frontend/src/scripts/features/branches.ts b/Frontend/src/scripts/features/branches.ts
index 936b802..af8af9a 100644
--- a/Frontend/src/scripts/features/branches.ts
+++ b/Frontend/src/scripts/features/branches.ts
@@ -285,7 +285,10 @@ export function bindBranchUI() {
notify(`Force-deleted '${name}'`);
await loadBranches();
await runHook('postBranchDelete', hookData);
- } catch (e) { console.error('Force delete failed:', e); notify('Force delete failed'); }
+ } catch (e) {
+ console.error('Force delete failed:', e);
+ notify('Force delete failed');
+ }
}
}});
}
From 57bbe73df83a3e4cdd471d215ab44847164cbefc Mon Sep 17 00:00:00 2001
From: Jordon <16258926+Jordonbc@users.noreply.github.com>
Date: Mon, 16 Mar 2026 18:12:54 +0000
Subject: [PATCH 2/5] Apply suggested fix to
Frontend/src/scripts/features/branches.ts from Copilot Autofix
Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>
---
Frontend/src/scripts/features/branches.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Frontend/src/scripts/features/branches.ts b/Frontend/src/scripts/features/branches.ts
index af8af9a..aaf6be2 100644
--- a/Frontend/src/scripts/features/branches.ts
+++ b/Frontend/src/scripts/features/branches.ts
@@ -234,8 +234,8 @@ export function bindBranchUI() {
items.push({ label: 'Set upstream…', action: async () => {
await loadBranches();
const remoteBranches = (state.branches || [])
- .filter((br: any) => (br?.kind?.type || '').toLowerCase() === 'remote')
- .map((br: any) => String(br?.name || '').trim())
+ .filter((br: Branch) => (br?.kind?.type || '').toLowerCase() === 'remote')
+ .map((br: Branch) => String(br?.name || '').trim())
.filter((s: string) => !!s);
if (remoteBranches.length === 0) {
From aba6f31e851d0343e862fc0d199b55c2dfce329f Mon Sep 17 00:00:00 2001
From: Jordon <16258926+Jordonbc@users.noreply.github.com>
Date: Mon, 16 Mar 2026 18:12:55 +0000
Subject: [PATCH 3/5] Apply suggested fix to
Frontend/src/scripts/features/branches.ts from Copilot Autofix
Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>
---
Frontend/src/scripts/features/branches.ts | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Frontend/src/scripts/features/branches.ts b/Frontend/src/scripts/features/branches.ts
index aaf6be2..15c9aa4 100644
--- a/Frontend/src/scripts/features/branches.ts
+++ b/Frontend/src/scripts/features/branches.ts
@@ -125,7 +125,11 @@ async function openBranchPopover() {
branchPop.style.top = `${r.bottom + 6}px`;
branchPop.hidden = false;
branchBtn.setAttribute('aria-expanded', 'true');
- try { refreshOverlayScrollbarsFor(branchPop); } catch {}
+ try {
+ refreshOverlayScrollbarsFor(branchPop);
+ } catch (err) {
+ console.debug('Failed to refresh scrollbars for branch popover:', err);
+ }
setTimeout(() => branchFilter?.focus(), 0);
}
From 3e1aa15070f410aa40cdd4101423f26b479e5da0 Mon Sep 17 00:00:00 2001
From: Jordon <16258926+Jordonbc@users.noreply.github.com>
Date: Mon, 16 Mar 2026 18:12:55 +0000
Subject: [PATCH 4/5] Apply suggested fix to
Frontend/src/scripts/features/branches.ts from Copilot Autofix
Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>
---
Frontend/src/scripts/features/branches.ts | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Frontend/src/scripts/features/branches.ts b/Frontend/src/scripts/features/branches.ts
index 15c9aa4..288b501 100644
--- a/Frontend/src/scripts/features/branches.ts
+++ b/Frontend/src/scripts/features/branches.ts
@@ -85,10 +85,11 @@ function renderBranches() {
const kindType = b.kind?.type || '';
const remoteFromName = b.name.includes('/') ? b.name.split('/')[0] : '';
const remote = b.kind?.remote || remoteFromName || '';
+ const remoteLabel = remote || 'remote';
let kindLabel = '';
if (kindType.toLowerCase() === 'local') kindLabel = 'Local';
- else if (kindType.toLowerCase() === 'remote') kindLabel = `Remote:${remote || 'remote'}`;
- else if (remote) kindLabel = `Remote:${remote || 'remote'}`;
+ else if (kindType.toLowerCase() === 'remote') kindLabel = `Remote:${remoteLabel}`;
+ else if (remote) kindLabel = `Remote:${remoteLabel}`;
return `
From 18b0ed6d65c381768154afadd76af17bed5c0c5d Mon Sep 17 00:00:00 2001
From: Jordon <16258926+Jordonbc@users.noreply.github.com>
Date: Mon, 16 Mar 2026 18:12:55 +0000
Subject: [PATCH 5/5] Apply suggested fix to
Frontend/src/scripts/features/branches.ts from Copilot Autofix
Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>
---
Frontend/src/scripts/features/branches.ts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Frontend/src/scripts/features/branches.ts b/Frontend/src/scripts/features/branches.ts
index 288b501..63c4a2e 100644
--- a/Frontend/src/scripts/features/branches.ts
+++ b/Frontend/src/scripts/features/branches.ts
@@ -18,7 +18,8 @@ import type { ConflictDetails, FileStatus } from '../types';
import { openConflictsSummary } from './conflicts';
import { getPluginContextMenuItems, runHook, runPluginAction } from '../plugins';
-type Branch = { name: string; full_ref?: string; current?: boolean; kind?: { type?: string; remote?: string } };
+type BranchKind = { type?: string; remote?: string };
+type Branch = { name: string; full_ref?: string; current?: boolean; kind?: BranchKind };
const branchBtn = qs('#branch-switch');
const branchName = qs('#branch-name');