gitbutlerapp
Conflicted commit getting checked out into working directory
Version
Version 0.13.3 (20241021.130557)
Operating System
macOS
Distribution Method
dmg (Apple Silicon)
Describe the issue
Unable to see the changes after apply a branch or If I create a branch.
Some screenshots:
Create a branch
Apply a branch
How to reproduce
Just create a new branch or apply a old branch
Expected behavior
To be able to see my branches.
Relevant log output
2024-10-21T15:42:09.616568Z INFO set_project_active:set_project_to_window:file monitor:handle debounced events: crates/gitbutler-watcher/src/file_monitor.rs:119: close time.busy=7.29µs time.idle=18.6µs id=0f86b13c-a1e6-401a-90ca-66b492b645a0 window="main" project_id=0f86b13c-a1e6-401a-90ca-66b492b645a0 fs_events=2 fs_events=2 ignored=0 ignored=0 git_noop=1 git_noop=1 git=0 git=0 project=0 project=0
2024-10-21T15:42:11.648221Z INFO set_project_active:set_project_to_window:file monitor:handle debounced events: crates/gitbutler-watcher/src/file_monitor.rs:119: new id=0f86b13c-a1e6-401a-90ca-66b492b645a0 window="main" project_id=0f86b13c-a1e6-401a-90ca-66b492b645a0
2024-10-21T15:42:11.648249Z INFO set_project_active:set_project_to_window:file monitor:handle debounced events: crates/gitbutler-watcher/src/file_monitor.rs:119: close time.busy=15.9µs time.idle=12.5µs id=0f86b13c-a1e6-401a-90ca-66b492b645a0 window="main" project_id=0f86b13c-a1e6-401a-90ca-66b492b645a0 fs_events=37 fs_events=37 ignored=0 ignored=0 git_noop=15 git_noop=15 git=0 git=0 project=0 project=0
2024-10-21T15:42:12.663974Z INFO set_project_active:set_project_to_window:file monitor:handle debounced events: crates/gitbutler-watcher/src/file_monitor.rs:119: new id=0f86b13c-a1e6-401a-90ca-66b492b645a0 window="main" project_id=0f86b13c-a1e6-401a-90ca-66b492b645a0
2024-10-21T15:42:12.663994Z INFO set_project_active:set_project_to_window:file monitor:handle debounced events: crates/gitbutler-watcher/src/file_monitor.rs:119: close time.busy=7.58µs time.idle=13.5µs id=0f86b13c-a1e6-401a-90ca-66b492b645a0 window="main" project_id=0f86b13c-a1e6-401a-90ca-66b492b645a0 fs_events=2 fs_events=2 ignored=0 ignored=0 git_noop=1 git_noop=1 git=0 git=0 project=0 project=0
2024-10-21T15:42:14.699724Z INFO set_project_active:set_project_to_window:file monitor:handle debounced events: crates/gitbutler-watcher/src/file_monitor.rs:119: new id=0f86b13c-a1e6-401a-90ca-66b492b645a0 window="main" project_id=0f86b13c-a1e6-401a-90ca-66b492b645a0
2024-10-21T15:42:14.699762Z INFO set_project_active:set_project_to_window:file monitor:handle debounced events: crates/gitbutler-watcher/src/file_monitor.rs:119: close time.busy=25.6µs time.idle=13.3µs id=0f86b13c-a1e6-401a-90ca-66b492b645a0 window="main" project_id=0f86b13c-a1e6-401a-90ca-66b492b645a0 fs_events=55 fs_events=55 ignored=0 ignored=0 git_noop=22 git_noop=22 git=0 git=0 project=0 project=0
2024-10-21T15:42:16.990116Z INFO set_project_active:set_project_to_window:file monitor:handle debounced events: crates/gitbutler-watcher/src/file_monitor.rs:119: new id=0f86b13c-a1e6-401a-90ca-66b492b645a0 window="main" project_id=0f86b13c-a1e6-401a-90ca-66b492b645a0
2024-10-21T15:42:16.990284Z INFO set_project_active:set_project_to_window:file monitor:handle debounced events: crates/gitbutler-watcher/src/file_monitor.rs:119: close time.busy=47.8µs time.idle=122µs id=0f86b13c-a1e6-401a-90ca-66b492b645a0 window="main" project_id=0f86b13c-a1e6-401a-90ca-66b492b645a0 fs_events=133 fs_events=133 ignored=0 ignored=0 git_noop=11 git_noop=11 git=0 git=0 project=0 project=0
NVM, I'm closing because I found the error. I don't know how I manage to create a virtual branch so big with so many conflicts after update gitbutler.
It's failing because it can't render it.
Thanks for reporting!
I think it would be good to re-open this issue as the image I see there shows a 'virtual tree', checked out into the worktree, which should never happen. Maybe I am wrong about this, and @Caleb-T-Owens would definitely know better.
Also, the performance issues is something we are working on, there are a couple of known ones that still need to be sorted out, but this one here seems like a bug to me that may have caused a performance issue to surface.
This indeed should never ever happen.
@Afsoon would you be able to send in your log files or describe/provide a reproduction for this issue, because it would be really good to get to the bottom of this.
You can find your log files with this guide: https://docs.gitbutler.com/development/debugging And you can email them to: [email protected]
Sorry for the inconvenience.
@Caleb-T-Owens I'm sending right now the logs. I don't know how to reproduce it exactly, but I can give you more information:
- My project state before update Gitbutler was:
- 2 virtual branches, the default branch had commited changes, one of the commits was a merge from main.
- The second virtual branch had files pending to be commited and only one commit, that was the merge from main, same as the other branch
After update to the latest version:
- Like 80% of my was removed from the root directory, and copy the same removed content to the folders
.conflict-base-0,.conficlit-side-0and.conflict-side-1 - A README was created with the content
You have checked out a GitButler Conflicted commit. You probably didn't mean to do this., but the app never warned me.
Sorry for the inconvenience.
Don't worry! The software is pre 1.0 and I know what I'm into it.
I don't now if it can help you, but I had to do a git prune, because git was complaining too many unreachable loose objects.
Stats before the git prune, using git count-objects -v:
count: 34494
size: 248224
in-pack: 20718
packs: 50
size-pack: 11132
prune-packable: 0
garbage: 0
size-garbage: 0
After prune it:
count: 29921
size: 226872
in-pack: 20718
packs: 50
size-pack: 11132
prune-packable: 0
garbage: 0
size-garbage: 0