Sporadic "The new head names do not match the current heads" error when integrating upstream

[cbjeukendrup]

Version

0.5.1708 nightly

Operating System

macOS

Distribution Method

dmg (Mac OS - Apple Silicon)

Describe the issue

Sometimes, when I click the "Update workspace" button in the upstream integration dialog, I encounter the following error:

command: integrate_upstream
params: {"projectId":"51f11ee2-cbed-4610-8cd5-d523d96803d4","resolutions":[{"stackId":"d1c0b721-2934-49a1-8c9c-e665622c81f3","approach":{"type":"rebase"},"deleteIntegratedBranches":true}]})

The new head names do not match the current heads

When this happens, the "Update workspace" button stays spinning, but when I then reload the window (cmd+R) everything seems fine again and the upstream commits have actually been integrated.

How to reproduce (Optional)

This does not happen every time, and I can't reproduce it anymore, but I do recall that I had a stack of branches applied at the moments that it happened. That stack used to consist of three branches, but since the bottom one had been integrated it was only two branches.
It might be the case that the error started happening since the bottom one was integrated, but I'm not certain about this.
I had unapplied this stack, and just now reapplied it. Now the bottom branch is suddenly back, with no commits in it. That does make it more likely that this somehow plays a role.

Expected behavior (Optional)

No response

Relevant log output (Optional)

[Byron]

Thanks a lot for reporting!

Unfortunately, the "integrate upstream" functionality has many issues, and not being atomic at all is one of them. We will redesign and rewrite it, but work hasn't started yet.

Meanwhile, for completeness, here is the spot that produces the error:

gitbutler/crates/gitbutler-stack/src/stack.rs

Line 764 in e07bb33

return Err(anyhow!("The new head names do not match the current heads"));

Maybe small fixes will be possible until the rewrite lands.