Skip to content

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

Open
EDM115 wants to merge 1 commit intopingdotgg:mainfrom
EDM115:edm115/fix-git-column
Open

fix(server): parse git branches correctly when column.ui is enabled#1529
EDM115 wants to merge 1 commit intopingdotgg:mainfrom
EDM115:edm115/fix-git-column

Conversation

@EDM115
Copy link
Copy Markdown

@EDM115 EDM115 commented Mar 29, 2026

What Changed

Added the --no-column flag to git operations that support it (git branch only here, if you ever use git tag at some point to list them, you'll need to add that too).
Reference : https://git-scm.com/docs/git-column

Why

Users (like myself) can have the setting column.ui set to always in their .gitconfig (for better readability), but this messes up with the branch parsing in t3code.

As you can see here, branches are put here "as-is", even tho they should be in separated lines.
Currently it parses go-bin copilot/rewrite-cli-in-rust as one branch while they are two separate ones. The --no-column flag fixes that :

UI Changes

None.

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes
  • I included a video for animation/interaction changes

Note

Low Risk
Low risk: only adjusts git branch invocation flags to stabilize stdout formatting; behavior changes are limited to branch listing/name discovery.

Overview
Fixes branch parsing when users have column.ui enabled by adding --no-column to all git branch calls used for listing branches.

This updates both listBranches (local + --remotes) and listLocalBranchNames so downstream logic (e.g. feature-branch auto-naming) receives one-branch-per-line output consistently.

Written by Cursor Bugbot for commit 3fc1fdd. This will update automatically on new commits. Configure here.

Note

Fix git branch parsing in listBranches and listLocalBranchNames when column.ui is enabled

When git's column.ui config is enabled, git branch formats output in columns, breaking line-by-line branch name parsing. Adding --no-column to all git branch invocations in GitCore.ts ensures output is always single-column regardless of user git config.

Macroscope summarized 3fc1fdd.

@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Mar 29, 2026

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: d543e19e-384d-424f-9e07-df2c89c88318

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions github-actions bot added size:XS 0-9 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list. labels Mar 29, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XS 0-9 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant