From 3fc1fdd75fec05e5014f126874dc06d1aa7077b1 Mon Sep 17 00:00:00 2001
From: EDM115 <github@edm115.dev>
Date: Sun, 29 Mar 2026 14:51:31 +0200
Subject: [PATCH] fix(server): parse git branches correctly when column.ui is
 enabled

---
 apps/server/src/git/Layers/GitCore.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/server/src/git/Layers/GitCore.ts b/apps/server/src/git/Layers/GitCore.ts
index 64ed409508..c84a01b3cb 100644
--- a/apps/server/src/git/Layers/GitCore.ts
+++ b/apps/server/src/git/Layers/GitCore.ts
@@ -1423,7 +1423,7 @@ export const makeGitCore = Effect.fn("makeGitCore")(function* (options?: {
     const localBranchResult = yield* executeGit(
       "GitCore.listBranches.branchNoColor",
       input.cwd,
-      ["branch", "--no-color"],
+      ["branch", "--no-color", "--no-column"],
       {
         timeoutMs: 10_000,
         allowNonZeroExit: true,
@@ -1438,7 +1438,7 @@ export const makeGitCore = Effect.fn("makeGitCore")(function* (options?: {
       return yield* createGitCommandError(
         "GitCore.listBranches",
         input.cwd,
-        ["branch", "--no-color"],
+        ["branch", "--no-color", "--no-column"],
         stderr || "git branch failed",
       );
     }
@@ -1446,7 +1446,7 @@ export const makeGitCore = Effect.fn("makeGitCore")(function* (options?: {
     const remoteBranchResultEffect = executeGit(
       "GitCore.listBranches.remoteBranches",
       input.cwd,
-      ["branch", "--no-color", "--remotes"],
+      ["branch", "--no-color", "--no-column", "--remotes"],
       {
         timeoutMs: 10_000,
         allowNonZeroExit: true,
@@ -1814,6 +1814,7 @@ export const makeGitCore = Effect.fn("makeGitCore")(function* (options?: {
     runGitStdout("GitCore.listLocalBranchNames", cwd, [
       "branch",
       "--list",
+      "--no-column",
       "--format=%(refname:short)",
     ]).pipe(
       Effect.map((stdout) =>