Sometimes "git pull" errors with "fatal: Cannot rebase onto multiple branches." but is fine immediately afterwards

[tomchiverton]

$ cd x.y
~/workspace/docker/sites/x.y [master|…13⚑ 1] 
09:41 $ git pull
fatal: Cannot rebase onto multiple branches.
~/workspace/docker/sites/x.y [master ↓·18|…13⚑ 1] 
09:41 $ git pull
Updating d1f83acf0..ae2ab08ef
Fast-forward

I assume something is going on in the background, and the prompt isn't waiting ?

[ogr3]

yes, that's the problem with the prompt updating in the background. Its mostly nice but this can happen - just wait a second or two and re-issue the pull command.

This happens in the git plugin for oh-my-zsh as well

[tomchiverton]

Is there no way to run the update synchronously ? I didn't see an option, and "git fetch" is normally quick...

[ogr3]

Not configurable at the moment - it was introduced 10 years ago as a key feature of this project in #23

[tomchiverton]

What about an extra delay before stating the background task ? This would give a chance for a "git X" after a "cd" into a clone to run first ?