Skip to content

fix(server): parse git branches correctly when column.ui is enabled #1529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EDM115 wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −3
Open

fix(server): parse git branches correctly when column.ui is enabled #1529

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions apps/server/src/git/Layers/GitCore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -1438,15 +1438,15 @@ 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",
);
}

const remoteBranchResultEffect = executeGit(
"GitCore.listBranches.remoteBranches",
input.cwd,
["branch", "--no-color", "--remotes"],
["branch", "--no-color", "--no-column", "--remotes"],
{
timeoutMs: 10_000,
allowNonZeroExit: true,
Expand Down Expand Up @@ -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) =>
Expand Down
Loading