"No commit with change id" when reordering commits

[bjeanes]

Version

0.14.4

Operating System

macOS

Distribution Method

dmg (Mac OS - Apple Silicon)

Describe the issue

No commit with change id 05441ce6-72d3-4a03-b223-5aaeca9f06fe found

I've been continually uncommitting all commits and then recommitting, as a workaround, but it's getting pretty tedious and error-prone.

How to reproduce (Optional)

I'm not sure how to reproduce but the context here is using stacked branches where the first branch in the stack has been merged (with squash, in this case, in case that is relevant).

Expected behavior (Optional)

No response

Relevant log output (Optional)

❯ /Applications/GitButler.app/Contents/MacOS/gitbutler-tauri
2025-01-13T02:48:44.058098Z  INFO crates/gitbutler-tauri/src/main.rs:62: system git executable for fetch/push: "git"
2025-01-13T02:48:44.058159Z  INFO crates/gitbutler-tauri/src/main.rs:99: starting app version=0.14.4 name=GitButler
2025-01-13T02:48:44.304095Z  INFO get_user: crates/gitbutler-tauri/src/users.rs:10: close time.busy=32.6ms time.idle=28.5µs
2025-01-13T02:48:44.367891Z  INFO list_projects: crates/gitbutler-tauri/src/projects.rs:46: close time.busy=82.5µs time.idle=15.5µs
2025-01-13T02:48:44.411923Z  INFO get_project: crates/gitbutler-tauri/src/projects.rs:32: close time.busy=1.40ms time.idle=15.7µs id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 no_validation=None
2025-01-13T02:48:44.423616Z  INFO git_head: crates/gitbutler-tauri/src/commands.rs:56: close time.busy=1.20ms time.idle=14.9µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357
2025-01-13T02:48:44.426306Z  INFO operating_mode: crates/gitbutler-tauri/src/modes.rs:16: close time.busy=1.08ms time.idle=13.9µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357
2025-01-13T02:48:44.428365Z  INFO get_base_branch_data:get_base_branch_data: crates/gitbutler-branch-actions/src/actions.rs:140: close time.busy=7.87ms time.idle=6.58µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357
2025-01-13T02:48:44.428378Z  INFO get_base_branch_data: crates/gitbutler-tauri/src/virtual_branches.rs:144: close time.busy=7.92ms time.idle=5.29µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357
2025-01-13T02:48:44.443539Z  INFO list_branches: crates/gitbutler-tauri/src/virtual_branches.rs:459: close time.busy=25.4ms time.idle=18.9µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 filter=Some(BranchListingFilter { local: None, applied: None })
2025-01-13T02:48:44.477750Z  INFO get_branch_listing_details: crates/gitbutler-tauri/src/virtual_branches.rs:471: close time.busy=14.2ms time.idle=19.5µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 branch_names=[]
2025-01-13T02:48:44.685081Z  INFO get_branch_listing_details: crates/gitbutler-tauri/src/virtual_branches.rs:471: close time.busy=29.4ms time.idle=23.0µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 branch_names=["Lane", "Lane-2", "Lane-1", "jf/profile-accepted-prework", "notifications-docs", "jf/profile-accepted", "jf/spike/auto-linker", "eng-2619-create-new-admin-view-of-availability-behind-the-profile"]
2025-01-13T02:48:44.694761Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=254µs time.idle=14.1µs key="user.name"
2025-01-13T02:48:44.694890Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=229µs time.idle=12.0µs key="user.name"
2025-01-13T02:48:44.703734Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=236µs time.idle=13.1µs key="user.email"
2025-01-13T02:48:44.932239Z  INFO get_base_branch_data:get_base_branch_data: crates/gitbutler-branch-actions/src/actions.rs:140: close time.busy=3.40ms time.idle=7.46µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357
2025-01-13T02:48:44.932255Z  INFO get_base_branch_data: crates/gitbutler-tauri/src/virtual_branches.rs:144: close time.busy=3.46ms time.idle=9.75µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357
2025-01-13T02:48:44.940961Z  INFO list_virtual_branches: crates/gitbutler-tauri/src/virtual_branches.rs:54: close time.busy=463ms time.idle=14.9µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357
2025-01-13T02:48:44.960671Z  INFO list_branches: crates/gitbutler-tauri/src/virtual_branches.rs:459: close time.busy=17.5ms time.idle=12.5µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 filter=Some(BranchListingFilter { local: None, applied: None })
2025-01-13T02:48:44.981109Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=351µs time.idle=17.0µs key="gitbutler.aiModelProvider"
2025-01-13T02:48:44.981446Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=300µs time.idle=10.5µs key="gitbutler.aiModelProvider"
2025-01-13T02:48:44.984076Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=285µs time.idle=8.29µs key="gitbutler.aiModelProvider"
2025-01-13T02:48:44.984377Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=230µs time.idle=4.08µs key="gitbutler.aiModelProvider"
2025-01-13T02:48:45.026131Z  INFO secret_get_global: crates/gitbutler-tauri/src/secret.rs:9: close time.busy=57.8µs time.idle=12.2µs handle="aiOpenAIKey"
2025-01-13T02:48:45.026368Z  INFO secret_get_global: crates/gitbutler-tauri/src/secret.rs:9: close time.busy=33.1µs time.idle=8.17µs handle="aiOpenAIKey"
2025-01-13T02:48:45.026567Z  INFO secret_get_global: crates/gitbutler-tauri/src/secret.rs:9: close time.busy=21.1µs time.idle=9.08µs handle="aiOpenAIKey"
2025-01-13T02:48:45.026788Z  INFO secret_get_global: crates/gitbutler-tauri/src/secret.rs:9: close time.busy=18.0µs time.idle=4.42µs handle="aiOpenAIKey"
2025-01-13T02:48:45.053123Z  INFO get_branch_listing_details: crates/gitbutler-tauri/src/virtual_branches.rs:471: close time.busy=27.3ms time.idle=25.2µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 branch_names=["Lane", "Lane-2", "Lane-1", "jf/profile-accepted-prework", "notifications-docs", "jf/profile-accepted", "jf/spike/auto-linker", "eng-2619-create-new-admin-view-of-availability-behind-the-profile"]
2025-01-13T02:48:45.085425Z  INFO secret_get_global: crates/gitbutler-tauri/src/secret.rs:9: close time.busy=79.5µs time.idle=14.5µs handle="aiAnthropicKey"
2025-01-13T02:48:45.085585Z  INFO secret_get_global: crates/gitbutler-tauri/src/secret.rs:9: close time.busy=35.8µs time.idle=8.46µs handle="aiAnthropicKey"
2025-01-13T02:48:45.085843Z  INFO secret_get_global: crates/gitbutler-tauri/src/secret.rs:9: close time.busy=29.1µs time.idle=8.46µs handle="aiAnthropicKey"
2025-01-13T02:48:45.086121Z  INFO secret_get_global: crates/gitbutler-tauri/src/secret.rs:9: close time.busy=27.4µs time.idle=8.50µs handle="aiAnthropicKey"
2025-01-13T02:48:45.086939Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=291µs time.idle=9.08µs key="user.name"
2025-01-13T02:48:45.091842Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=507µs time.idle=14.1µs key="user.name"
2025-01-13T02:48:45.110286Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=297µs time.idle=17.7µs key="gitbutler.aiOllamaEndpoint"
2025-01-13T02:48:45.110498Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=342µs time.idle=9.17µs key="gitbutler.aiOllamaEndpoint"
2025-01-13T02:48:45.110642Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=243µs time.idle=6.71µs key="gitbutler.aiOllamaEndpoint"
2025-01-13T02:48:45.111028Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=340µs time.idle=9.71µs key="gitbutler.aiOllamaEndpoint"
2025-01-13T02:48:45.111094Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=260µs time.idle=7.67µs key="user.email"
2025-01-13T02:48:45.133680Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=356µs time.idle=14.9µs key="user.email"
2025-01-13T02:48:45.133850Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=281µs time.idle=19.7µs key="gitbutler.aiOllamaModelName"
2025-01-13T02:48:45.134079Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=310µs time.idle=9.92µs key="gitbutler.aiOllamaModelName"
2025-01-13T02:48:45.134326Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=255µs time.idle=7.67µs key="gitbutler.aiOllamaModelName"
2025-01-13T02:48:45.134529Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=299µs time.idle=10.5µs key="gitbutler.aiOllamaModelName"
2025-01-13T02:48:45.135284Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=297µs time.idle=8.12µs key="gitbutler.aiModelProvider"
2025-01-13T02:48:45.135423Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=230µs time.idle=7.54µs key="gitbutler.aiModelProvider"
2025-01-13T02:48:45.135567Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=193µs time.idle=6.21µs key="gitbutler.aiModelProvider"
2025-01-13T02:48:45.135861Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=224µs time.idle=9.50µs key="gitbutler.aiModelProvider"
2025-01-13T02:48:45.136141Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=217µs time.idle=5.83µs key="gitbutler.aiOpenAIKeyOption"
2025-01-13T02:48:45.136396Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=266µs time.idle=8.12µs key="gitbutler.aiOpenAIKeyOption"
2025-01-13T02:48:45.136525Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=225µs time.idle=13.9µs key="gitbutler.aiOpenAIKeyOption"
2025-01-13T02:48:45.136964Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=195µs time.idle=5.12µs key="gitbutler.aiOpenAIKeyOption"
2025-01-13T02:48:45.137429Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=220µs time.idle=5.21µs key="gitbutler.aiAnthropicKeyOption"
2025-01-13T02:48:45.137715Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=302µs time.idle=7.54µs key="gitbutler.aiAnthropicKeyOption"
2025-01-13T02:48:45.137919Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=221µs time.idle=7.50µs key="gitbutler.aiAnthropicKeyOption"
2025-01-13T02:48:45.138142Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=195µs time.idle=5.62µs key="gitbutler.aiAnthropicKeyOption"
2025-01-13T02:48:45.253737Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=304µs time.idle=22.1µs key="user.name"
2025-01-13T02:48:45.268944Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=475µs time.idle=21.1µs key="user.email"
2025-01-13T02:48:45.452949Z  INFO list_branches: crates/gitbutler-tauri/src/virtual_branches.rs:459: close time.busy=18.3ms time.idle=22.0µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 filter=Some(BranchListingFilter { local: None, applied: None })
2025-01-13T02:48:45.464170Z  INFO fetch_from_remotes:get_base_branch_data: crates/gitbutler-branch-actions/src/actions.rs:140: close time.busy=4.77ms time.idle=14.9µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 action=Some("auto")
2025-01-13T02:48:45.464180Z  INFO fetch_from_remotes: crates/gitbutler-tauri/src/virtual_branches.rs:499: close time.busy=1.04s time.idle=8.75µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 action=Some("auto")
2025-01-13T02:48:45.484674Z  INFO get_branch_listing_details: crates/gitbutler-tauri/src/virtual_branches.rs:471: close time.busy=28.1ms time.idle=22.4µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 branch_names=["Lane", "Lane-2", "Lane-1", "jf/profile-accepted-prework", "notifications-docs", "jf/profile-accepted", "jf/spike/auto-linker", "eng-2619-create-new-admin-view-of-availability-behind-the-profile"]
2025-01-13T02:48:45.486396Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=242µs time.idle=8.29µs key="user.name"
2025-01-13T02:48:45.487097Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=190µs time.idle=5.96µs key="user.email"
2025-01-13T02:48:45.512131Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=288µs time.idle=20.4µs key="user.name"
2025-01-13T02:48:45.533799Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=337µs time.idle=17.6µs key="user.email"
2025-01-13T02:48:45.722740Z  INFO handle:calculate_virtual_branches: crates/gitbutler-watcher/src/handler.rs:88: close time.busy=258ms time.idle=15.2µs event=VirtualBranch(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357)
2025-01-13T02:48:45.722757Z  INFO handle: crates/gitbutler-watcher/src/handler.rs:54: close time.busy=258ms time.idle=6.71µs event=VirtualBranch(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357)
2025-01-13T02:48:46.450301Z  INFO set_project_active:set_project_to_window:file monitor:handle debounced events: crates/gitbutler-watcher/src/file_monitor.rs:119: close time.busy=132µs time.idle=74.3µs id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 window="main" project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 fs_events=84 fs_events=84 ignored=0 ignored=0 git_noop=43 git_noop=43 git=1 git=1 project=0 project=0 git_dedup=1 git_dedup=1
2025-01-13T02:48:46.450790Z  INFO handle: crates/gitbutler-watcher/src/handler.rs:54: close time.busy=311µs time.idle=16.4µs event=GitFileChange(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357, FETCH_HEAD)
2025-01-13T02:48:46.968739Z  INFO get_base_branch_data:get_base_branch_data: crates/gitbutler-branch-actions/src/actions.rs:140: close time.busy=13.5ms time.idle=30.7µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357
2025-01-13T02:48:46.968766Z  INFO get_base_branch_data: crates/gitbutler-tauri/src/virtual_branches.rs:144: close time.busy=13.8ms time.idle=18.4µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357
2025-01-13T02:48:47.513757Z  INFO list_branches: crates/gitbutler-tauri/src/virtual_branches.rs:459: close time.busy=38.9ms time.idle=47.6µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 filter=Some(BranchListingFilter { local: None, applied: None })
2025-01-13T02:48:47.552044Z  INFO get_branch_listing_details: crates/gitbutler-tauri/src/virtual_branches.rs:471: close time.busy=31.0ms time.idle=18.6µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 branch_names=["Lane", "Lane-2", "Lane-1", "jf/profile-accepted-prework", "notifications-docs", "jf/profile-accepted", "jf/spike/auto-linker", "eng-2619-create-new-admin-view-of-availability-behind-the-profile"]
2025-01-13T02:48:47.553747Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=317µs time.idle=9.46µs key="user.name"
2025-01-13T02:48:47.554665Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=229µs time.idle=7.50µs key="user.email"
2025-01-13T02:48:47.574607Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=264µs time.idle=9.42µs key="user.name"
2025-01-13T02:48:47.587669Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=310µs time.idle=11.8µs key="user.email"
2025-01-13T02:49:11.802792Z  INFO set_project_active:set_project_to_window:file monitor:handle debounced events: crates/gitbutler-watcher/src/file_monitor.rs:119: close time.busy=9.62µs time.idle=38.1µs id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 window="main" project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 fs_events=1 fs_events=1 ignored=0 ignored=0 git_noop=0 git_noop=0 git=0 git=0 project=0 project=0
2025-01-13T02:49:12.237990Z  INFO fetch_from_remotes:get_base_branch_data: crates/gitbutler-branch-actions/src/actions.rs:140: close time.busy=4.55ms time.idle=21.8µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 action=Some("modal")
2025-01-13T02:49:12.238012Z  INFO fetch_from_remotes: crates/gitbutler-tauri/src/virtual_branches.rs:499: close time.busy=1.05s time.idle=15.5µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 action=Some("modal")
2025-01-13T02:49:12.243626Z  INFO get_base_branch_data:get_base_branch_data: crates/gitbutler-branch-actions/src/actions.rs:140: close time.busy=4.28ms time.idle=16.0µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357
2025-01-13T02:49:12.243640Z  INFO get_base_branch_data: crates/gitbutler-tauri/src/virtual_branches.rs:144: close time.busy=4.34ms time.idle=6.04µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357
2025-01-13T02:49:12.255828Z  INFO list_branches: crates/gitbutler-tauri/src/virtual_branches.rs:459: close time.busy=16.2ms time.idle=14.5µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 filter=Some(BranchListingFilter { local: None, applied: None })
2025-01-13T02:49:12.285308Z  INFO get_branch_listing_details: crates/gitbutler-tauri/src/virtual_branches.rs:471: close time.busy=25.7ms time.idle=14.9µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 branch_names=["Lane", "Lane-2", "Lane-1", "jf/profile-accepted-prework", "notifications-docs", "jf/profile-accepted", "jf/spike/auto-linker", "eng-2619-create-new-admin-view-of-availability-behind-the-profile"]
2025-01-13T02:49:12.286940Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=267µs time.idle=8.67µs key="user.name"
2025-01-13T02:49:12.287767Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=222µs time.idle=7.00µs key="user.email"
2025-01-13T02:49:12.313105Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=285µs time.idle=17.4µs key="user.name"
2025-01-13T02:49:12.324069Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=305µs time.idle=14.5µs key="user.email"
2025-01-13T02:49:12.499504Z  INFO handle:calculate_virtual_branches: crates/gitbutler-watcher/src/handler.rs:88: close time.busy=261ms time.idle=12.9µs event=VirtualBranch(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357)
2025-01-13T02:49:12.499521Z  INFO handle: crates/gitbutler-watcher/src/handler.rs:54: close time.busy=261ms time.idle=5.38µs event=VirtualBranch(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357)
2025-01-13T02:49:12.778447Z  INFO list_branches: crates/gitbutler-tauri/src/virtual_branches.rs:459: close time.busy=23.4ms time.idle=20.4µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 filter=Some(BranchListingFilter { local: None, applied: None })
2025-01-13T02:49:12.808955Z  INFO get_branch_listing_details: crates/gitbutler-tauri/src/virtual_branches.rs:471: close time.busy=26.7ms time.idle=16.1µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 branch_names=["Lane", "Lane-2", "Lane-1", "jf/profile-accepted-prework", "notifications-docs", "jf/profile-accepted", "jf/spike/auto-linker", "eng-2619-create-new-admin-view-of-availability-behind-the-profile"]
2025-01-13T02:49:12.814157Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=302µs time.idle=9.50µs key="user.name"
2025-01-13T02:49:12.815180Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=246µs time.idle=9.46µs key="user.email"
2025-01-13T02:49:12.839649Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=322µs time.idle=10.1µs key="user.name"
2025-01-13T02:49:12.851350Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=298µs time.idle=13.6µs key="user.email"
2025-01-13T02:49:13.071809Z  INFO set_project_active:set_project_to_window:file monitor:handle debounced events: crates/gitbutler-watcher/src/file_monitor.rs:119: close time.busy=37.7µs time.idle=15.4µs id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 window="main" project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 fs_events=42 fs_events=42 ignored=0 ignored=0 git_noop=21 git_noop=21 git=1 git=1 project=0 project=0 git_dedup=1 git_dedup=1
2025-01-13T02:49:13.071929Z  INFO handle: crates/gitbutler-watcher/src/handler.rs:54: close time.busy=69.9µs time.idle=11.5µs event=GitFileChange(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357, FETCH_HEAD)
2025-01-13T02:49:13.585212Z  INFO get_base_branch_data:get_base_branch_data: crates/gitbutler-branch-actions/src/actions.rs:140: close time.busy=4.14ms time.idle=11.6µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357
2025-01-13T02:49:13.585225Z  INFO get_base_branch_data: crates/gitbutler-tauri/src/virtual_branches.rs:144: close time.busy=4.25ms time.idle=11.8µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357
2025-01-13T02:49:14.051663Z  INFO upstream_integration_statuses: crates/gitbutler-tauri/src/virtual_branches.rs:585: close time.busy=997ms time.idle=24.0µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 target_commit_oid=None
2025-01-13T02:49:14.110041Z  INFO list_branches: crates/gitbutler-tauri/src/virtual_branches.rs:459: close time.busy=22.5ms time.idle=17.7µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 filter=Some(BranchListingFilter { local: None, applied: None })
2025-01-13T02:49:14.145353Z  INFO get_branch_listing_details: crates/gitbutler-tauri/src/virtual_branches.rs:471: close time.busy=31.9ms time.idle=23.0µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 branch_names=["Lane", "Lane-2", "Lane-1", "jf/profile-accepted-prework", "notifications-docs", "jf/profile-accepted", "jf/spike/auto-linker", "eng-2619-create-new-admin-view-of-availability-behind-the-profile"]
2025-01-13T02:49:14.149650Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=323µs time.idle=12.4µs key="user.name"
2025-01-13T02:49:14.150652Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=258µs time.idle=8.42µs key="user.email"
2025-01-13T02:49:14.167701Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=311µs time.idle=14.2µs key="user.name"
2025-01-13T02:49:14.179222Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=305µs time.idle=17.8µs key="user.email"
2025-01-13T02:49:14.851878Z  INFO set_project_active:set_project_to_window:file monitor:handle debounced events: crates/gitbutler-watcher/src/file_monitor.rs:119: close time.busy=176µs time.idle=65.9µs id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 window="main" project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 fs_events=685 fs_events=685 ignored=0 ignored=0 git_noop=52 git_noop=52 git=0 git=0 project=0 project=0
2025-01-13T02:49:19.624201Z  INFO integrate_upstream:create_snapshot: crates/gitbutler-oplog/src/oplog.rs:155: close time.busy=34.8ms time.idle=20.7µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 resolutions=[Resolution { branch_id: a7756d57-fd2f-4e73-a01a-450a90e2efaa, branch_tree: aae8cce0d28959a3198b5f7fbef23b3a904016f9, approach: Rebase }, Resolution { branch_id: 67e6e096-a9f8-4b9b-a716-9a98ec5d497b, branch_tree: d8cdfeb4a4c66cca541b6a633118126b4c116805, approach: Rebase }, Resolution { branch_id: 73d44934-562f-4631-a007-348883968700, branch_tree: 4ac40e8c6837127678276d1bfa019f15c9fa8974, approach: Delete }] base_branch_resolution=None
2025-01-13T02:49:22.061580Z  INFO integrate_upstream: crates/gitbutler-tauri/src/virtual_branches.rs:601: close time.busy=2.47s time.idle=26.7µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 resolutions=[Resolution { branch_id: a7756d57-fd2f-4e73-a01a-450a90e2efaa, branch_tree: aae8cce0d28959a3198b5f7fbef23b3a904016f9, approach: Rebase }, Resolution { branch_id: 67e6e096-a9f8-4b9b-a716-9a98ec5d497b, branch_tree: d8cdfeb4a4c66cca541b6a633118126b4c116805, approach: Rebase }, Resolution { branch_id: 73d44934-562f-4631-a007-348883968700, branch_tree: 4ac40e8c6837127678276d1bfa019f15c9fa8974, approach: Delete }] base_branch_resolution=None
2025-01-13T02:49:22.067872Z  INFO get_base_branch_data:get_base_branch_data: crates/gitbutler-branch-actions/src/actions.rs:140: close time.busy=4.09ms time.idle=13.5µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357
2025-01-13T02:49:22.067884Z  INFO get_base_branch_data: crates/gitbutler-tauri/src/virtual_branches.rs:144: close time.busy=4.15ms time.idle=8.00µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357
2025-01-13T02:49:22.301946Z  INFO handle:calculate_virtual_branches: crates/gitbutler-watcher/src/handler.rs:88: close time.busy=240ms time.idle=14.5µs event=VirtualBranch(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357)
2025-01-13T02:49:22.301958Z  INFO handle: crates/gitbutler-watcher/src/handler.rs:54: close time.busy=240ms time.idle=5.17µs event=VirtualBranch(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357)
2025-01-13T02:49:22.617307Z  INFO list_branches: crates/gitbutler-tauri/src/virtual_branches.rs:459: close time.busy=43.0ms time.idle=46.3µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 filter=Some(BranchListingFilter { local: None, applied: None })
2025-01-13T02:49:22.655499Z  INFO get_branch_listing_details: crates/gitbutler-tauri/src/virtual_branches.rs:471: close time.busy=33.9ms time.idle=18.5µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 branch_names=["Lane", "Lane-2", "Lane-1", "jf/profile-accepted-prework", "notifications-docs", "jf/profile-accepted", "jf/spike/auto-linker", "eng-2619-create-new-admin-view-of-availability-behind-the-profile"]
2025-01-13T02:49:22.657078Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=281µs time.idle=9.92µs key="user.name"
2025-01-13T02:49:22.657845Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=223µs time.idle=7.04µs key="user.email"
2025-01-13T02:49:22.680704Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=392µs time.idle=15.3µs key="user.name"
2025-01-13T02:49:22.680756Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=283µs time.idle=19.6µs key="user.name"
2025-01-13T02:49:22.709347Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=364µs time.idle=17.6µs key="user.email"
2025-01-13T02:49:22.789418Z  INFO get_branch_listing_details: crates/gitbutler-tauri/src/virtual_branches.rs:471: close time.busy=22.8ms time.idle=16.3µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 branch_names=["eng-2515/sunset-old-dashboards"]
2025-01-13T02:49:23.250389Z  INFO set_project_active:set_project_to_window:file monitor:handle debounced events: crates/gitbutler-watcher/src/file_monitor.rs:119: close time.busy=11.0ms time.idle=43.8µs id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 window="main" project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 fs_events=1758 fs_events=1758 ignored=0 ignored=0 git_noop=176 git_noop=176 git=2 git=2 project=26 project=26 git_dedup=2 git_dedup=2 project_dedup=26 project_dedup=26
2025-01-13T02:49:23.250686Z  INFO handle: crates/gitbutler-watcher/src/handler.rs:54: close time.busy=159µs time.idle=11.7µs event=GitFileChange(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357, logs/HEAD, index)
2025-01-13T02:49:23.252444Z  INFO handle: crates/gitbutler-watcher/src/handler.rs:54: close time.busy=1.86ms time.idle=20.4µs event=GitButlerOplogChange(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357)
2025-01-13T02:49:23.499465Z  INFO handle:recalculate_everything:calculate_virtual_branches: crates/gitbutler-watcher/src/handler.rs:88: close time.busy=35.3ms time.idle=19.5µs event=ProjectFileChange(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357, config/locales/profile_availability.en.yml, spec/core/moderation/resume_warning_spec.rb, spec/core/profile_photos/work_reprocessing_tasks_spec.rb, app/core/profile_availability/day.rb, app/models/submission.rb […21 more]) paths=26
2025-01-13T02:49:23.499556Z  INFO handle:recalculate_everything: crates/gitbutler-watcher/src/handler.rs:129: close time.busy=249ms time.idle=6.38µs event=ProjectFileChange(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357, config/locales/profile_availability.en.yml, spec/core/moderation/resume_warning_spec.rb, spec/core/profile_photos/work_reprocessing_tasks_spec.rb, app/core/profile_availability/day.rb, app/models/submission.rb […21 more]) paths=26
2025-01-13T02:49:23.499564Z  INFO handle: crates/gitbutler-watcher/src/handler.rs:54: close time.busy=249ms time.idle=8.92µs event=ProjectFileChange(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357, config/locales/profile_availability.en.yml, spec/core/moderation/resume_warning_spec.rb, spec/core/profile_photos/work_reprocessing_tasks_spec.rb, app/core/profile_availability/day.rb, app/models/submission.rb […21 more])
2025-01-13T02:49:24.500996Z  INFO set_project_active:set_project_to_window:file monitor:handle debounced events: crates/gitbutler-watcher/src/file_monitor.rs:119: close time.busy=57.4µs time.idle=53.5µs id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 window="main" project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 fs_events=34 fs_events=34 ignored=0 ignored=0 git_noop=24 git_noop=24 git=0 git=0 project=0 project=0
2025-01-13T02:49:25.049042Z  INFO unapply_without_saving_virtual_branch:create_snapshot: crates/gitbutler-oplog/src/oplog.rs:155: close time.busy=21.5ms time.idle=20.4µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 branch_id=67e6e096-a9f8-4b9b-a716-9a98ec5d497b
some branches already selected for changes
2025-01-13T02:49:25.313347Z  INFO unapply_without_saving_virtual_branch: crates/gitbutler-tauri/src/virtual_branches.rs:224: close time.busy=293ms time.idle=21.0µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 branch_id=67e6e096-a9f8-4b9b-a716-9a98ec5d497b
2025-01-13T02:49:25.335778Z  INFO list_branches: crates/gitbutler-tauri/src/virtual_branches.rs:459: close time.busy=21.1ms time.idle=15.4µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 filter=Some(BranchListingFilter { local: None, applied: None })
2025-01-13T02:49:25.375238Z  INFO get_branch_listing_details: crates/gitbutler-tauri/src/virtual_branches.rs:471: close time.busy=34.1ms time.idle=19.6µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 branch_names=["Lane", "Lane-2", "Lane-1", "jf/profile-accepted-prework", "notifications-docs", "jf/profile-accepted", "jf/spike/auto-linker", "eng-2619-create-new-admin-view-of-availability-behind-the-profile", "eng-2515/sunset-old-dashboards"]
2025-01-13T02:49:25.491755Z  INFO get_branch_listing_details: crates/gitbutler-tauri/src/virtual_branches.rs:471: close time.busy=20.7ms time.idle=22.4µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 branch_names=["8e971381-5e16-4129-b5f2-b26a171c689e"]
2025-01-13T02:49:25.499230Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=234µs time.idle=13.5µs key="user.name"
2025-01-13T02:49:25.499422Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=307µs time.idle=10.3µs key="user.name"
2025-01-13T02:49:25.501333Z  INFO git_get_global_config: crates/gitbutler-tauri/src/commands.rs:88: close time.busy=303µs time.idle=9.96µs key="user.email"
2025-01-13T02:49:25.541602Z  INFO handle:calculate_virtual_branches: crates/gitbutler-watcher/src/handler.rs:88: close time.busy=228ms time.idle=12.6µs event=VirtualBranch(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357)
2025-01-13T02:49:25.541617Z  INFO handle: crates/gitbutler-watcher/src/handler.rs:54: close time.busy=228ms time.idle=3.79µs event=VirtualBranch(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357)
2025-01-13T02:49:26.285037Z  INFO set_project_active:set_project_to_window:file monitor:handle debounced events: crates/gitbutler-watcher/src/file_monitor.rs:119: close time.busy=6.66ms time.idle=53.2µs id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 window="main" project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 fs_events=175 fs_events=175 ignored=0 ignored=0 git_noop=113 git_noop=113 git=2 git=2 project=5 project=5 git_dedup=2 git_dedup=2 project_dedup=5 project_dedup=5
2025-01-13T02:49:26.285303Z  INFO handle: crates/gitbutler-watcher/src/handler.rs:54: close time.busy=191µs time.idle=11.3µs event=GitFileChange(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357, index, logs/HEAD)
2025-01-13T02:49:26.287646Z  INFO handle: crates/gitbutler-watcher/src/handler.rs:54: close time.busy=2.48ms time.idle=15.8µs event=GitButlerOplogChange(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357)
2025-01-13T02:49:26.530205Z  INFO handle:recalculate_everything:calculate_virtual_branches: crates/gitbutler-watcher/src/handler.rs:88: close time.busy=31.6ms time.idle=20.2µs event=ProjectFileChange(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357, .buildkite/deploy.yml, app/core/profile_photos/work_reprocessing_tasks.rb, config/initializers/cron.rb, config/initializers/good_job.rb, spec/core/profile_photos/work_reprocessing_tasks_spec.rb) paths=5
2025-01-13T02:49:26.530263Z  INFO handle:recalculate_everything: crates/gitbutler-watcher/src/handler.rs:129: close time.busy=245ms time.idle=5.75µs event=ProjectFileChange(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357, .buildkite/deploy.yml, app/core/profile_photos/work_reprocessing_tasks.rb, config/initializers/cron.rb, config/initializers/good_job.rb, spec/core/profile_photos/work_reprocessing_tasks_spec.rb) paths=5
2025-01-13T02:49:26.530269Z  INFO handle: crates/gitbutler-watcher/src/handler.rs:54: close time.busy=245ms time.idle=6.88µs event=ProjectFileChange(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357, .buildkite/deploy.yml, app/core/profile_photos/work_reprocessing_tasks.rb, config/initializers/cron.rb, config/initializers/good_job.rb, spec/core/profile_photos/work_reprocessing_tasks_spec.rb)
2025-01-13T02:49:27.541943Z  INFO set_project_active:set_project_to_window:file monitor:handle debounced events: crates/gitbutler-watcher/src/file_monitor.rs:119: close time.busy=30.0µs time.idle=36.2µs id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 window="main" project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 fs_events=27 fs_events=27 ignored=0 ignored=0 git_noop=18 git_noop=18 git=0 git=0 project=0 project=0
2025-01-13T02:49:35.628941Z  INFO reorder_stack:create_snapshot: crates/gitbutler-oplog/src/oplog.rs:155: close time.busy=17.8ms time.idle=17.9µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 branch_id=a7756d57-fd2f-4e73-a01a-450a90e2efaa stack_order=StackOrder { series: [SeriesOrder { name: "eng-2546-work-reprocessing-tasks", commit_ids: [d3b064da5c51e9f9c96bbfb12ffce02de388156a, 24cc0f4cf7cbdeac9312a7cd050757a655a558d5, 442b8eb22e4550d59575407137af4a337b5eb26d, 6eb1596e96f133fdb05493fffdf3ac09d3a44631, f92018c51d24b6771a99b423ac2e0b940a4631f1] }, SeriesOrder { name: "eng-2546-add-photo-reprocessing-task-queue", commit_ids: [] }] }
2025-01-13T02:49:36.435920Z ERROR reorder_stack: crates/gitbutler-tauri/src/virtual_branches.rs:432: error=Error(No commit with change id 05441ce6-72d3-4a03-b223-5aaeca9f06fe found) project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 branch_id=a7756d57-fd2f-4e73-a01a-450a90e2efaa stack_order=StackOrder { series: [SeriesOrder { name: "eng-2546-work-reprocessing-tasks", commit_ids: [d3b064da5c51e9f9c96bbfb12ffce02de388156a, 24cc0f4cf7cbdeac9312a7cd050757a655a558d5, 442b8eb22e4550d59575407137af4a337b5eb26d, 6eb1596e96f133fdb05493fffdf3ac09d3a44631, f92018c51d24b6771a99b423ac2e0b940a4631f1] }, SeriesOrder { name: "eng-2546-add-photo-reprocessing-task-queue", commit_ids: [] }] }
2025-01-13T02:49:36.435945Z  INFO reorder_stack: crates/gitbutler-tauri/src/virtual_branches.rs:432: close time.busy=830ms time.idle=16.4µs project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 branch_id=a7756d57-fd2f-4e73-a01a-450a90e2efaa stack_order=StackOrder { series: [SeriesOrder { name: "eng-2546-work-reprocessing-tasks", commit_ids: [d3b064da5c51e9f9c96bbfb12ffce02de388156a, 24cc0f4cf7cbdeac9312a7cd050757a655a558d5, 442b8eb22e4550d59575407137af4a337b5eb26d, 6eb1596e96f133fdb05493fffdf3ac09d3a44631, f92018c51d24b6771a99b423ac2e0b940a4631f1] }, SeriesOrder { name: "eng-2546-add-photo-reprocessing-task-queue", commit_ids: [] }] }
2025-01-13T02:49:37.198180Z  INFO set_project_active:set_project_to_window:file monitor:handle debounced events: crates/gitbutler-watcher/src/file_monitor.rs:119: close time.busy=299µs time.idle=77.0µs id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 window="main" project_id=83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357 fs_events=475 fs_events=475 ignored=0 ignored=0 git_noop=74 git_noop=74 git=0 git=0 project=0 project=0
2025-01-13T02:49:37.202643Z  INFO handle: crates/gitbutler-watcher/src/handler.rs:54: close time.busy=4.12ms time.idle=42.9µs event=GitButlerOplogChange(83e52fbe-a2ed-4e8d-9c14-1a9a1df8c357)

[Byron]

Thanks a lot for reporting, and sorry for the hassle!

Squashed commits are a likely cause of this, and I'd hope that #5893 can help with this to the point where it works as expected.