WIP: make_update: support Github style of remote organization #104479
Closed
Sergey Sharybin
wants to merge 1 commits from
When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Sergey:make_update into main
pull from: Sergey:make_update
merge into: blender:main
blender:main
blender:brush-assets-project
blender:fix-121021
blender:blender-v3.3-release
blender:partial-write-refactor
blender:universal-scene-description
blender:blender-v4.1-release
blender:blender-v3.6-release
blender:blender-v3.6-temp_wmoss_animrig_public
blender:temp-sculpt-dyntopo
blender:gpencil-next
blender:anim/animation-id-113594
blender:blender-v4.0-release
blender:blender-projects-basics
blender:bridge-curves
blender:sculpt-blender
blender:asset-browser-frontend-split
blender:asset-shelf
blender:tmp-usd-python-mtl
blender:tmp-usd-3.6
blender:blender-v3.5-release
blender:blender-v2.93-release
blender:realtime-clock
blender:sculpt-dev
blender:bevelv2
blender:xr-dev
When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
1 Commits
| Author | SHA1 | Message | Date |
|---|---|---|---|
 Sergey Sharybin
|
cccd07daa3 |
Fix make update for upstream workflwo and missing branch in submodule
Fix the issue when upstream workflow is used and the addons fork does not yet have the release branch. In this case create a local branch which is based on the upstream/<branch> but does not track anything. Typically with such workflow the local branches will track origin, but since the origin does not have the branch yet it is not possible to track it. Test plan: - Use upstream workflow - Have a fork of addons, which does not have blender-v3.6-release - Run make update The error message: ``` Updating scripts/addons ... git fetch origin git fetch upstream git checkout -t origin/blender-v3.6-release fatal: 'origin/blender-v3.6-release' is not a commit and a branch 'blender-v3.6-release' cannot be created from it make: *** [update] Error 128 ``` |