Project has a 'main' virtual branch that does not exist

[eproxus]

Version

0.12.25 (20240912.103915)

Operating System

Mac OS X

Distribution Method

dmg (Apple Silicon)

Describe the issue

I have a project that has a local virtual branch called main and when I click on it I just get an error popup saying "Failed to find branch". I also have another private branch with a different name that behaves just the same.

How to reproduce

No idea. If I remove the GitButler project and remove the gitbutler/target and gitbutler/workspace branches manually and then add it back, I still have these broken virtual branches in GitButler.

Expected behavior

They either shouldn't show up at all or it should be possible to delete them somehow.

Relevant log output

No response

[Byron]

Thanks a lot for reporting!

I would expect that the issue goes away if the .git/gitbutler/virtual_branches.toml gets deleted, or renamed, as it's the source of truth for which virtual branches exist.

Also, I am aware that GitButler can create its own virtual branches - in the moment there is a single change in the worktree it auto-creates a virtual branch to capture it. However, typically these actually exist afterwards.

Maybe you could try to remove or rename the aforementioned file and see if it fixes the problem. It would be my guess that it's fixed initially and then re-occours. And when that happens, maybe we find a way to reproduce it here as well.

Thanks a lot for your help.

[eproxus]

Deleting .git/gitbutler/virtual_branches.toml got rid of the "virtual main" branch, but not the other branch.

[eproxus]

The other branch turned out to be a real branch in my repo that GitButler couldn't apply for some reason (the error was the same, "Failed to find branch"). Once I deleted that in the Git repo itself, it also disappeared from the GitButler UI.

[eproxus]

Now I'm in another weird state (I have no virtual branches) where clicking Update in the workspace generates the error "Failed to update workspace: Projects has active conflicts" even though there are no changes whatsoever...

[eproxus]

Deleting .git/gitbutler/** and deleting the gitbutler/target and gitbutler/workspace and restarting GitButler creates the "virtual main" branch again in the project and the update still doesn't work, showing the above error.

[eproxus]

I think I found the culprit. There seems to be a GitButler WIP Commit on my main branch (!). This is something that should never happen, I think?