Skip to content
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.

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

Do not filter to remote branches only #3110

Closed
wants to merge 3 commits into from
Closed

Conversation

schacon
Copy link
Member

@schacon schacon commented Mar 11, 2024

Way back in November, we reverted functionality where we would list local branches in addition to remote branches in our sidebar. It makes sense, we want to be able to convert local branches to virtual branches. But due to naming confusion, the branches have been restricted to remote branches ever since.

This PR is exploring what we need minimally to revert this back to listing all branches that you can turn into virtual branches.

  • filter out gitbutler/integration
  • filter out remote branches that are already fully contained in any virtual branch head

@krlvi
Copy link
Member

krlvi commented Mar 11, 2024

Consider renaming the command or alternatively I can do it in a new PR

@schacon schacon marked this pull request as draft March 11, 2024 16:22
@schacon
Copy link
Member Author

schacon commented Mar 11, 2024

I'm mainly just pushing up my notes to make sure you see them, but we need to decide if we want to refactor all the code around "remote" branches or just get something minimal working and address it later. Now all the Typescript code has been renamed to RemoteBranch (it used to be the more generic BranchData), the Rust structs are all "RemoteX", there's Remote stuff all over the place, when they all meant "normal git branch" for a while.

But now I'm seeing some other bugs in applying remote branches that are also issues converting local branches into virtual branches, so I'm going down the rabbit hole of figuring out why that is exactly.

@schacon schacon force-pushed the sc-show-local-branches branch 2 times, most recently from 417d364 to ed4cc4f Compare March 14, 2024 12:06
@schacon schacon force-pushed the sc-show-local-branches branch 2 times, most recently from 0d7c289 to 14fee1c Compare March 22, 2024 09:03
@schacon schacon mentioned this pull request May 19, 2024
@schacon schacon closed this May 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants