fix(server): parse git branches correctly when column.ui is enabled#1529
Open
EDM115 wants to merge 1 commit intopingdotgg:mainfrom
Open
fix(server): parse git branches correctly when column.ui is enabled#1529EDM115 wants to merge 1 commit intopingdotgg:mainfrom
EDM115 wants to merge 1 commit intopingdotgg:mainfrom
Conversation
|
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What Changed
Added the
--no-columnflag to git operations that support it (git branchonly here, if you ever usegit tagat 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.uiset toalwaysin their.gitconfig(for better readability), but this messes up with the branch parsing int3code.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-rustas one branch while they are two separate ones. The--no-columnflag fixes that :UI Changes
None.
Checklist
Note
Low Risk
Low risk: only adjusts
git branchinvocation flags to stabilize stdout formatting; behavior changes are limited to branch listing/name discovery.Overview
Fixes branch parsing when users have
column.uienabled by adding--no-columnto allgit branchcalls used for listing branches.This updates both
listBranches(local +--remotes) andlistLocalBranchNamesso 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
listBranchesandlistLocalBranchNameswhencolumn.uiis enabledWhen git's
column.uiconfig is enabled,git branchformats output in columns, breaking line-by-line branch name parsing. Adding--no-columnto allgit branchinvocations in GitCore.ts ensures output is always single-column regardless of user git config.Macroscope summarized 3fc1fdd.