Fix make_update switching branches with multiple upstreams #105176

Sergey Sharybin · 2023-02-24T15:49:42+01:00

Sergey Sharybin commented

2023-02-24 15:49:42 +01:00

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.

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.

Sergey Sharybin added the

Module

Platforms, Builds & Tests

label 2023-02-24 15:49:42 +01:00

Sergey Sharybin added 1 commit 2023-02-24 15:49:56 +01:00

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.

Sergey Sharybin requested review from Brecht Van Lommel 2023-02-24 15:50:02 +01:00

Sergey Sharybin added this to the Platforms, Builds Tests & Devices project 2023-02-24 15:51:55 +01:00

Brecht Van Lommel approved these changes 2023-02-24 16:21:28 +01:00

Sergey Sharybin merged commit f30c395a7c into blender-v3.5-release

2023-02-24 17:08:58 +01:00

Sergey Sharybin referenced this issue from a commit

2023-02-24 17:08:58 +01:00

Fix make_update switching branches with multiple upstreams

Sergey Sharybin deleted branch make_update

2023-02-24 17:08:59 +01:00

Sign in to join this conversation.

No reviewers

No Label

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

Fix make_update switching branches with multiple upstreams #105176