Fix make_update switching branches with multiple upstreams #105176

Merged
Sergey Sharybin merged 1 commits from Sergey/blender:make_update into blender-v3.5-release 2023-02-24 17:08:58 +01:00

1 Commits

Author SHA1 Message Date
Sergey Sharybin 1f891541d2 Fix make_update switching branches with multiple upstreams
If repository has multiple remotes with the same name of branch
checking out to the branch using simple `git checkout branch` exists
with an error: this is because there is ambiguity w.r.t which remote
to track.

Now the code explicitly provides remote to track, preferring to use
"origin" first (which is to be used for Blender style of workflow,
and Github style workflow when there is a fork available), and use
"upstream" if there is no origin.
2023-02-24 15:46:44 +01:00